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
93,993 Commits 36 Branches 191 Tags
f4ae8af9ea59d726554e47eecb00a8ee2984580d
Commit Graph

82748 Commits

Author SHA1 Message Date
Laurent Destailleur
f4ae8af9ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
 2021-03-29 21:39:53 +02:00
Laurent Destailleur
6057d8aabd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2021-03-29 21:37:21 +02:00
Laurent Destailleur
eabe5ae616 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-03-29 21:35:54 +02:00
Laurent Destailleur
8c08b3945b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-03-29 21:35:46 +02:00
Laurent Destailleur
dc0922c8f0 Clean file not used 2021-03-29 21:33:01 +02:00
Alexandre SPANGARO
56ae51375d FIX Search on date in accountancy 2021-03-27 07:11:28 +01:00
Laurent Destailleur
e2b02726a7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-26 01:37:37 +01:00
Laurent Destailleur
512a570b63 FIX error for duplicate thirdparty found correctly returned by ws 2021-03-26 01:37:19 +01:00
Laurent Destailleur
a4aa806e44 Merge pull request #16933 from daraelmin/daraelmin-patch-2 
Fix #16794 V13 order by status instead of statut
 2021-03-25 08:31:44 +01:00
Laurent Destailleur
5826d7747c Merge pull request #16938 from FHenry/13_fix_POST 
change $_POST to GETPOST
 2021-03-25 01:30:08 +01:00
Laurent Destailleur
443fd544be Update time.php 2021-03-25 01:07:29 +01:00
Laurent Destailleur
c5d9c1481a Merge pull request #16948 from hregis/fix_return_edit_mode_if_update_error 
FIX missing return edit if update error
 2021-03-25 01:04:03 +01:00
Laurent Destailleur
965ee16270 Fix typo 2021-03-24 21:53:56 +01:00
Laurent Destailleur
21a9779fe2 FIX inconsistency in margin recording with option "Force to sale price" 2021-03-24 21:49:45 +01:00
Regis Houssin
05419441aa FIX missing return edit if update error 2021-03-23 19:58:15 +01:00
ATM john
4f693b86c2 shhhhhh ! There is nothing here... 2021-03-23 19:27:40 +01:00
Laurent Destailleur
af593099df Clean string 2021-03-22 23:52:14 +01:00
stickler-ci
ba66eaeb18 Fixing style errors. 2021-03-22 14:42:31 +00:00
Florian HENRY
b121587582 change to GETPOST 2021-03-22 15:39:54 +01:00
daraelmin
6ba878725e Fix #16794 V13 order by status instead of statut 2021-03-22 07:28:16 +01:00
Laurent Destailleur
debcef9b55 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-22 00:08:19 +01:00
Laurent Destailleur
f1fb7e732e Fix trans 2021-03-22 00:07:35 +01:00
Laurent Destailleur
6c89ef803e Merge pull request #16894 from daraelmin/daraelmin-patch-5 
Fix #16893 #16897 V13 picto UpToDate change to Unpaid sometimes
 2021-03-21 22:19:15 +01:00
daraelmin
99d4618ab5 Fix 16897 V13 Wrong picto for Expired membership 
Force picto for Expired membership when no subscription is needed to Waiting (as other)
 2021-03-21 13:49:17 +01:00
daraelmin
860a2f2ffa Fix #16893 picto UpToDate change to Unpaid sometimes 
#Fix #16893 picto UpToDate change to Unpaid sometimes

As $now is set on the start of the script. 
But, the timestamp may change before LibStatut is called at the end. 
To avoid this we add 10 second to $now before comparing to dol_now() in LibStatut
 2021-03-21 11:36:23 +01:00
Laurent Destailleur
861a5becf1 Merge pull request #16884 from daraelmin/daraelmin-patch-3 
#Fix #16767 v13 unremovable attached file in mailmodel
 2021-03-20 19:51:07 +01:00
daraelmin
2d7f858c1a #Fix #16767 unremovable attached file in mailmodel 
#Fix #16767 unremovable attached file in mailmodel
 2021-03-20 14:04:20 +01:00
Laurent Destailleur
7f6044c52e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/projet/card.php
	htdocs/projet/contact.php
	htdocs/projet/tasks/comment.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/document.php
	htdocs/projet/tasks/task.php
 2021-03-20 12:18:40 +01:00
Laurent Destailleur
d5865dbfcc Merge pull request #16791 from Robin-Yann/12.0 
FIX: fix checkbox displayed according to module project setup parameters - work in progress
 2021-03-20 12:06:03 +01:00
Chl
36baf9b76b FIX #16143 Old PG requires "()" on DROP FUNCTION 
On PostgreSQL 9.6 and previous, the upgrade script fails with a syntax
error if the dropped function's name is not followed by parentheses.

Patch tested on 9.6 and 13.2.
 2021-03-20 11:56:19 +01:00
Frédéric FRANCE
2de2f1ce4d fix nested comments for doxygen 2021-03-20 09:02:29 +01:00
Robin
26dc897042 Merge branch '12.0' of https://github.com/Robin-Yann/dolibarr into 12.0 
htdocs/projet/card.php
 2021-03-19 11:12:49 +01:00
Robin
d852816101 FIX: fix checkbox displayed according to module project setup parameters 2021-03-19 09:54:11 +01:00
Florian HENRY
df4a243f18 fix: PRODUIT_PDF_MERGE_PROPAL options do not work with new product feature 2021-03-18 17:13:34 +01:00
Laurent Destailleur
03941a59af Clean code 2021-03-18 12:21:35 +01:00
Laurent Destailleur
af340ec133 Fix #yogosha5657 2021-03-18 12:18:38 +01:00
Laurent Destailleur
e37e0399e5 Fix bad message 2021-03-18 12:10:23 +01:00
Robin
b3757a6f69 FIX: fix checkbox displayed according to module project setup parameters - work in progress 2021-03-18 11:07:48 +01:00
Laurent Destailleur
26dc3ef1b0 FIX Filter on debit/credit 
Conflicts:
	htdocs/compta/bank/bankentries_list.php
 2021-03-16 18:59:28 +01:00
Laurent Destailleur
59174315ae Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-16 15:15:12 +01:00
Laurent Destailleur
a29a9e5435 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-16 15:14:46 +01:00
Laurent Destailleur
66bbc7f54f Merge pull request #16734 from AlexisLaurier/11.0 
correct nb_expedition count
 2021-03-16 15:12:18 +01:00
Alexis LAURIER
971b97d78f correct nb_expedition count 2021-03-16 15:00:46 +01:00
Laurent Destailleur
f514dec6ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
 2021-03-16 14:50:06 +01:00
Laurent Destailleur
3a3c0bad2f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-16 14:46:15 +01:00
Laurent Destailleur
95ede60de2 Fix css 2021-03-16 14:46:00 +01:00
Juanjo Menent
76cf3da449 FIX: Cannot delete a batch material from item receipts 2021-03-15 18:10:59 +01:00
Laurent Destailleur
614720fc0a FIX #16671 Can not generate zip file of documents in backup tool 2021-03-15 14:51:36 +01:00
Laurent Destailleur
d905d92434 Merge pull request #16637 from frederic34/patch-4 
force check if newref needed if project create fail
 2021-03-15 11:31:07 +01:00
Laurent Destailleur
7bbcf4aa00 FIX #16629 2021-03-15 11:23:08 +01:00