lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
93,966 Commits 43 Branches 150 Tags 886 MiB
99d4618ab5
Commit Graph

93966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Laurent Destailleur
2df54d5da7
Merge pull request #16858 from frederic34/patch-10 
fix nested comments for doxygen
 2021-03-20 11:25:01 +01:00
Frédéric FRANCE
2de2f1ce4d
fix nested comments for doxygen 2021-03-20 09:02:29 +01:00
Robin
d89d0782c9 Merge branch '12.0' of https://github.com/Robin-Yann/dolibarr into 12.0 2021-03-19 11:15:24 +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
cb4c047aa3 Merge branch '12.0' of https://github.com/Robin-Yann/dolibarr into 12.0 
htdocs/projet/card.php
 2021-03-19 10:00:10 +01:00
Robin
d852816101 FIX: fix checkbox displayed according to module project setup parameters 2021-03-19 09:54:11 +01:00
Laurent Destailleur
b1cf252989
Merge pull request #16800 from FHenry/13.0 
fix: PRODUIT_PDF_MERGE_PROPAL options do not work with new product feature
 2021-03-18 22:55:45 +01:00
Florian HENRY
572656cb64 fix type 2021-03-18 17:14:59 +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
b5edfdf6f6
Merge pull request #16687 from atm-florianm/fix/12.0_min_php_version_in_composer_json 
Fix/12.0 min php version in composer json
 2021-03-15 17:16:27 +01:00
Florian Mortgat
a5f6ee5889 Merge branch '12.0' of github.com:Dolibarr/dolibarr into fix/12.0_min_php_version_in_composer_json 2021-03-15 15:06:54 +01:00
Florian Mortgat
631aad94e7 FIX PHP version requirement in composer.json 2021-03-15 15:05:01 +01:00
Laurent Destailleur
8243ffc174 Changelog 2021-03-15 14:53:40 +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
Laurent Destailleur
401c209a76 Prepare 13.0.2 2021-03-14 23:54:52 +01:00
Laurent Destailleur
fede7b7a15
Merge pull request #16633 from frederic34/patch-3 
fix number is already used doesn't propose new code with elephant
 2021-03-12 20:18:46 +01:00
Frédéric FRANCE
815a7683a2
force getnextref if project create fail 2021-03-12 16:48:43 +01:00
Frédéric FRANCE
7a2e28497d
fix number is already used doesn't propose new code with elephant 2021-03-12 13:14:53 +01:00
Laurent Destailleur
706ba46295 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-12 12:46:49 +01:00
Laurent Destailleur
cab0e0ee05 Prepare 13.0.2 2021-03-12 12:45:45 +01:00
Laurent Destailleur
9956373a14 Backport the log to detect module that claim a new token. 2021-03-12 12:42:26 +01:00
Laurent Destailleur
63465fb7b1
Merge pull request #16627 from hregis/fix_missing_mp4_mime 
FIX missing mp4 video mime
 2021-03-12 11:15:27 +01:00
Florian HENRY
3841005806 fix message creted teicket trans no entities 2021-03-12 10:41:21 +01:00
Regis Houssin
5375add08c FIX just add mp4 2021-03-12 08:41:56 +01:00
Regis Houssin
290f49a3e0 FIX wrong extension 2021-03-12 08:39:36 +01:00
Regis Houssin
05532ca6b7 FIX missing video mime 2021-03-12 08:35:13 +01:00
Laurent Destailleur
6a5d3bdec2
Merge pull request #16602 from fmarcet/13.0 
FIX: Buttons to disable bindings not working
 2021-03-11 16:05:12 +01:00
Laurent Destailleur
e6a08e5382
Merge pull request #16607 from FHenry/13.0 
fix: modulebuilder default boxes showboxes
 2021-03-10 15:36:37 +01:00
Laurent Destailleur
43836836e4
Merge pull request #16610 from atm-lena/12.0_FIX_Sociales_Create_KeepValues_Error 
FIX create sociales : keep values error form
 2021-03-10 15:30:06 +01:00
Laurent Destailleur
c209d9b45e
Update paiement_charge.php 2021-03-10 15:29:05 +01:00