vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
126990 commits 1 branch 0 tags 1.5 GiB
Commit graph

126990 commits

This branch
This branch
All branches
Author SHA1 Message Date
Saami PERDRIX
398ad8d1f7
L'entrée de menu GRH > Notes de frais > Règlements n'est plus affiché (#26572) 
quand le module banque est désactivé
 2023-11-13 20:56:41 +01:00
Saami PERDRIX
a22a3ed7b4
Fix: ajout indemnites kilometriques non fonctionnels avec mariadb >= 10.6 (#26574) 2023-11-13 20:49:58 +01:00
Laurent Destailleur
6173075b73 SEC: Fix #yogosha18324 2023-11-13 20:46:06 +01:00
Laurent Destailleur
31b5528151 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-13 19:08:50 +01:00
Laurent Destailleur
d5139398cd Remove warning we should not have in a common usage. 2023-11-13 19:08:33 +01:00
Laurent Destailleur
967d7747cd css 2023-11-13 15:44:31 +01:00
Laurent Destailleur
c6c7b6692d Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-13 15:33:32 +01:00
Laurent Destailleur
68ffe0960d Trans 2023-11-13 15:27:42 +01:00
Laurent Destailleur
061f340f90 Debug v19 2023-11-13 15:20:56 +01:00
Laurent Destailleur
c8c8618e55 Debug v19 2023-11-13 15:17:55 +01:00
Laurent Destailleur
f36154a14f css 2023-11-13 14:26:34 +01:00
Laurent Destailleur
d86159409d Doc 2023-11-13 14:03:14 +01:00
Frédéric FRANCE
400128243b
confirm delete extrafield (#26565) 2023-11-13 13:01:14 +01:00
Laurent Destailleur
69642e1048 Fix missing the src type and id when uploading a file as a message of 
ticket
 2023-11-13 12:36:38 +01:00
Laurent Destailleur
7659bba97a Fix bad delete of lines into llx_ecm_files 2023-11-13 12:24:47 +01:00
Laurent Destailleur
20321d67da Prepare 19.0 2023-11-13 10:18:10 +01:00
Laurent Destailleur
46662c1ed4 Prepare freeze 2023-11-13 03:31:35 +01:00
Laurent Destailleur
3d3a7ff497 Fix tool 2023-11-13 03:18:44 +01:00
Laurent Destailleur
8fd688bb51 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-11-13 02:59:22 +01:00
Laurent Destailleur
2d6559d74f Fix warning 2023-11-13 02:42:47 +01:00
thibdrev
86bad02b9d
FIX #26553 Supplier invoice - Do not display the delete button for reconciled payment (#26554) 
* do not display delete button if payment is reconciled

* add isReconciled() function

* phpcs fix: replace spaces by tab

* phpcs fix: Whitespace found at end of line

* phpcs
 2023-11-12 23:41:59 +01:00
Alexandre SPANGARO
7fa9fb80fa
FIX #25967 Supplier export - Missing filter on accountancy buy account (#26559) 2023-11-12 23:33:28 +01:00
Laurent Destailleur
a48e541093 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/core/class/html.formadmin.class.php
	htdocs/core/lib/functions.lib.php
 2023-11-12 23:18:19 +01:00
Laurent Destailleur
2f340a1a77 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/comm/propal/card.php
 2023-11-12 23:06:31 +01:00
Laurent Destailleur
201ad75360 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
 2023-11-12 23:02:18 +01:00
Laurent Destailleur
bd2285ab91 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-11-12 22:58:37 +01:00
Laurent Destailleur
1dbb3f1f34 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/product/stock/stockatdate.php
 2023-11-12 22:58:23 +01:00
Laurent Destailleur
79b7b9486b Doc 2023-11-12 22:40:23 +01:00
Laurent Destailleur
17ca6f651c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-11-12 22:18:06 +01:00
Alexandre SPANGARO
cc452f2136
FIX Accountancy - Possibility to write in bookkeeping expense report operation with some line not bound (#26545) 
* FIX Accountancy - Possibility to write in bookkeeping expense report operation with some line not bound

* Update expensereportsjournal.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-12 22:16:47 +01:00
sonikf
65b9f4e6de
NEW: Add invoice subtype in customer template invoice (#26543) 
* Add invoice subtype in template invoice

* Add invoice subtype in template invoice

* Add invoice subtype in template invoice
 2023-11-12 22:08:46 +01:00
Klaas Oldenburger
a1c295185d
Update main.lang (#26546) 
correcting date short format to dutch settings
 2023-11-12 21:59:28 +01:00
Alexandre SPANGARO
2e458d9390
FIX #26536 Accountancy - Balance - Not divided lines by label & account, only by account (#26547) 2023-11-12 21:52:47 +01:00
Laurent Destailleur
d6179c74f1 Fix add exit after redirect header 2023-11-12 21:48:06 +01:00
thibdrev
390260640a
fix #26551 Supplier Invoice - Display the error message when trying to delete an already reconciled payment (#26552) 
* fix #26551

* fix white space at the end of lines
 2023-11-12 21:44:42 +01:00
daraelmin
129927047a
FIX regression on planned bank entries (#26556) 2023-11-12 21:36:25 +01:00
Laurent Destailleur
b709de584c Debug v19 2023-11-11 15:35:23 +01:00
Laurent Destailleur
b6b63b8655 Typo 2023-11-11 15:02:24 +01:00
Laurent Destailleur
b702928190 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-11 13:44:20 +01:00
Laurent Destailleur
3ecbab81cd Close #26542. The PR was not atomic and contains both a fix for a 
control and a change in priority of lines processed. This generated
conflicts in merge process with old version. So I try to report the most
important (the fix) manually.
 2023-11-11 13:32:16 +01:00
andreubisquerra
3a87df33a8
NEW TakePOS compatibility with lots and serials (#26426) 
* NEW TakePOS compatibility with lots and serials

* Travis FIX

* Remove special_code

* Last improvements

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-11 12:23:12 +01:00
Frédéric FRANCE
09696078f3
overall percentage of advancement is false if specials lines (#26522) 2023-11-10 19:05:17 +01:00
sonikf
455dcd8eb9
NEW: Propagate invoice extrafields into template invoice (#26529) 
* NEW: Propagate invoice extrafields into template invoice

Also rearrange form fields to be on par with other invoice creation screens look and feel

* fix PHPCS
 2023-11-10 19:03:39 +01:00
lamrani abdelwadoud
5a105ad462
NEW functionality for combined salary invoice and supplier invoice (#26541) 
* NEW functionality for combined salary invoice and supplier invoice

* remove print_r
 2023-11-10 19:00:30 +01:00
lamrani abdelwadoud
07d2d6b861
NEW functionality for get bon prelevement in ligne order (#26540) 
* Fix massaction checkbox for display it on right side

* get all order lines request
 2023-11-10 18:56:52 +01:00
lamrani abdelwadoud
d549b06295
NEW clone skill object (#26526) 2023-11-10 18:53:32 +01:00
sonikf
c18588550b
NEW: Add invoice subtype in template invoice (SQL part) (#26535) 
* Add column subtype

* Add column subtype

* Add column subtype in llx_facture_rec and llx_facture_fourn_rec
 2023-11-10 18:52:17 +01:00
HENRY Florian
caf41ca9ff
fix: display stock mvt in inventories done (#26527) 2023-11-10 18:51:22 +01:00
lamrani abdelwadoud
c4b2555667
Fix massaction checkbox for display it on right side (#26539) 2023-11-10 18:49:20 +01:00
Frédéric FRANCE
3c31401c9c
fix auguria init (#26534) 
* fix auguria init

* fix auguria init

* fix auguria init
 2023-11-10 18:48:18 +01:00