Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
126,919 Commits 36 Branches 189 Tags
cb15d8c7beb0db960202c0207fe164e65e59349c
Commit Graph

126919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Frédéric FRANCE
ed9d5ce2c3 fix phpstan (#26537) 2023-11-10 18:45:52 +01:00
lamrani abdelwadoud
01d3526d8d FIX sql request in function checkIfSalary (#26538) 
* fix sql request in function checkIfSalary

* Update bonprelevement.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-10 18:45:20 +01:00
Laurent Destailleur
44227666d3 NEW Better protection against reserved words 2023-11-10 18:20:02 +01:00
Laurent Destailleur
6cdb7c929a Debug v19 2023-11-10 15:10:41 +01:00
Laurent Destailleur
9714dd6735 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-10 14:05:53 +01:00
Laurent Destailleur
b7599afc4d Add log 2023-11-10 14:05:36 +01:00
Laurent Destailleur
07d5a937e7 css 2023-11-09 17:47:10 +01:00
Laurent Destailleur
f601be4764 CSS 2023-11-09 16:04:05 +01:00
Laurent Destailleur
3118b9fb4c Debug v19 2023-11-09 15:50:42 +01:00
Laurent Destailleur
e36e3c8421 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-09 15:44:28 +01:00
Laurent Destailleur
955af0695e Fix return code 2023-11-09 15:44:17 +01:00
atm-lena
0946220e9b Check price base type (#26503) 
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
 2023-11-09 15:41:39 +01:00
atm-sami
53b48173f6 NEW add sorting of product price list by customer (#26483) 
* added sorting of product price list by customer

* add search and sort in same time

* Update price.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-09 14:55:35 +01:00
thibdrev
a69fd2bc09 Fix PR #26501 (#26515) 2023-11-09 14:52:09 +01:00
HENRY Florian
5a23bb27b0 fix: bad sql on delete discount (#26517) 2023-11-09 14:51:42 +01:00
Laurent Destailleur
398077462c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-09 14:29:05 +01:00
Laurent Destailleur
c16ac9b7de Debug v19. Prepare compatibility 8.2 2023-11-09 14:28:50 +01:00
Laurent Destailleur
991c1fe6e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-11-09 11:51:52 +01:00
Mohamed DAOUD
6db7c487d2 NEW #19501 Add two hooks in dolreceiptprinter.php (#26439) 
* Add two hooks in dolreceiptprinter.php

* fix PHPCS error

* fix PHPCS errors
 2023-11-09 11:47:10 +01:00
Laurent Destailleur
a9f8b1d8bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-09 11:31:38 +01:00
Laurent Destailleur
8a5d57b09a Debug v19 2023-11-09 11:31:16 +01:00