Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-28 12:21:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
126,677 Commits 36 Branches 191 Tags
fca403b49bbee1ac7af7f99d34706d44eb8d3afc
Commit Graph

13519 Commits

Author SHA1 Message Date
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
17ca6f651c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-11-12 22:18:06 +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
daraelmin
129927047a FIX regression on planned bank entries (#26556) 2023-11-12 21:36:25 +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
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
3118b9fb4c Debug v19 2023-11-09 15:50:42 +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
thibdrev
a69fd2bc09 Fix PR #26501 (#26515) 2023-11-09 14:52:09 +01:00
lvessiller-opendsi
785c85205b FIX substitute project variables in invoice documents (#26445) 
* FIX substitute project variables in invoice documents

* Keep key to substitute if no link with project
 2023-11-08 17:32:23 +01:00
sonikf
e8b45a1ea9 Fix #26050 #26225 and fiscal year report (backport v 18) (#26474) 2023-11-08 17:27:52 +01:00
Laurent Destailleur
ccfaaeb03b Debug v19 2023-11-08 16:25:49 +01:00
sonikf
edac1bb6cc Add missing info for proper use and creation of template invoice (clients and vendors) (#26475) 
* Add missing info for proper use and creation of template invoice

* Add missing info for proper use and creation of template invoice

* fix trans of generated invoice
 2023-11-07 18:18:06 +01:00
Mohamed DAOUD
1e053e4d7f fix-warnings-1 (#26490) 2023-11-07 17:58:35 +01:00
Laurent Destailleur
74ff2acc6c Debug v19 2023-11-07 15:03:45 +01:00
Laurent Destailleur
1e2d06bf80 Debug v19 2023-11-07 14:18:33 +01:00
Laurent Destailleur
e5d9fb10e5 Debug v19 2023-11-07 13:12:07 +01:00
Laurent Destailleur
cb81978080 NEW Add field TechnicalID in list of users 2023-11-07 11:07:31 +01:00
Laurent Destailleur
dc07b9f567 Debug v19 2023-11-07 10:55:23 +01:00
Laurent Destailleur
be58db508d Debug v19 2023-11-07 10:51:00 +01:00
Laurent Destailleur
8ec367406d Clean code 2023-11-06 20:23:33 +01:00
Laurent Destailleur
ca78eff61f Fix round 2023-11-06 20:00:16 +01:00
Laurent Destailleur
3bd677ffb9 Debug v19 2023-11-06 19:59:19 +01:00
Laurent Destailleur
c154a72d88 Debug v19 2023-11-06 19:32:04 +01:00
Laurent Destailleur
6fc0a868f5 Debug v19 2023-11-06 16:51:37 +01:00
Laurent Destailleur
56bb63c388 Debug v19 2023-11-06 16:29:00 +01:00
Laurent Destailleur
7cd178e3f9 Debug v19 2023-11-06 16:25:26 +01:00
lamrani abdelwadoud
23ce23021f NEW functionality for request_transfer (#26078) 
* NEW functionality for request_transfer

* fix problem

* fix problem in transferBank

* fix request sql

* ajust functions for salary invoices

* add badges for each onglet invoice and salary

* Fix update in table bon_prelevement for amount

* Fix in section virement_request list of bonPrelevements

* for prelevemts lignes

* for prelevemts lignes

* update sql for get lignes prelevement with correct info

* update sql for get lignes prelevement with correct info

* add function for check if invoice salaries

* adjust bonprelevement for get salaries

* fix incoherences in create function for class BonPrelevement

* fix request sql for insert in prelevement ligne table

* fix problems and incoherences

* remove parametre  from function

* add parenthensises for cast  in sql request

* disable button when make demande virement

* fix condition for type

* fix conflit "

* fix whitespace

* fix condition for sourcetype

* fix page demandes.php for list salaries invoices

* add prefix db

* fix incoherences for conditions

* Update virement_request.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-06 16:09:05 +01:00
Mohamed DAOUD
a1597e6eb1 Fix some warnings -technical debt- (#26466) 
* fix warnings 1

* fix previous commit 1

* Update facture-rec.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-06 16:00:24 +01:00
sonikf
ab41ccf314 fix #26050 #26225 and fiscal year report (#26456) 2023-11-06 01:40:03 +01:00
Laurent Destailleur
7624035bd1 Code comment 2023-11-06 01:32:30 +01:00
Laurent Destailleur
b65d5c8740 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-05 19:52:54 +01:00
thibdrev
1eb0e66736 fix Rename is not translated because its translation isn't declared (#26447) 
`htdocs/compta/bank/releve.php` calls for `$langs->trans("Rename") at line 374 , but this translation doesn't exists: `grep -Rl "Rename=" ./htdocs/langs/`

Also, this translation seems to be called only by `releve.php` (`grep -Rl '$langs->trans("Rename")'`)
 2023-11-03 16:31:33 +01:00
thibdrev
3b30a94e43 fix error message ErrorThisBankReceiptIsAlreadyUsed is not translated (#26448) 
* fix missing translation for ErrorThisBankReceiptIsAlreadyUsed

* add translation key to fr_FR

* modify error message key in releve.php
 2023-11-03 16:30:29 +01:00
Laurent Destailleur
99f50e5fa1 Fix comment 2023-11-02 14:12:57 +01:00
Laurent Destailleur
127de7e7d8 FIX On object validation, ecm index are not updated for uploaded files 2023-11-01 16:17:54 +01:00
atm-jonathan
f36e8b935c Fix list agenda (#26394) 
* int $nbtotalrecord list agenda

* nbtotal of record should  be number not a string

* ternaire isnumeric $nbtotalofrecords
 2023-11-01 15:58:45 +01:00
Laurent Destailleur
f9c29489d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-01 15:52:32 +01:00
Laurent Destailleur
0708f0c53f Add fields to allow batch management into POS module 2023-11-01 15:52:02 +01:00
Christophe Battarel
3afaa266c3 add hook tabContentCreateInvoice (#26413) 
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-11-01 14:25:14 +01:00
Laurent Destailleur
74e1ec4099 FIX On object validation, ecm index are not updated for uploaded files 2023-10-31 19:28:11 +01:00
Christophe Battarel
4c8870f205 add hook tabContentViewInvoice (#26402) 
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-10-31 11:54:39 +01:00
Mohamed DAOUD
08ef416958 New: Adding the PDF option displaying the product's barcode number (#26345) 
* Add a PDF option to show barcode number of product

* Add space before and after IF keyword

* fix error phpcs

* add barcode label before barcode number

* Use outputlangs and not langs

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-30 03:13:12 +01:00
Laurent Destailleur
197f0a19ec NEW Add more param on fetch() to prepare perf optimization 2023-10-26 21:05:37 +02:00