Commit Graph

112767 Commits

Author SHA1 Message Date
Laurent Destailleur
186185267e Clean code for v15 2021-11-29 00:49:18 +01:00
Laurent Destailleur
bb38ea79f4 css 2021-11-29 00:05:42 +01:00
Laurent Destailleur
81e7483911 css 2021-11-28 23:51:20 +01:00
Frédéric FRANCE
308998e21c
Merge remote-tracking branch 'upstream/develop' into productmerge 2021-11-28 21:14:12 +01:00
Frédéric FRANCE
5473dbd3f0
add direct print for contracts 2021-11-28 20:55:17 +01:00
Laurent Destailleur
2d92130c1e External backups can be downloaded from the "About info page". 2021-11-28 19:25:58 +01:00
Laurent Destailleur
36eb79c14d Fix filter on "Refuse emailing" 2021-11-28 16:49:13 +01:00
Laurent Destailleur
2ba5f1369f Fix alternate 2021-11-28 15:53:55 +01:00
Laurent Destailleur
c41578a3c3 Fix php compatibility 2021-11-28 15:43:22 +01:00
Laurent Destailleur
ca11dcae22 Fix php compatibility 2021-11-28 15:41:19 +01:00
Laurent Destailleur
ce651fae58 Fix php compatibility 2021-11-28 15:35:03 +01:00
Laurent Destailleur
5d31bd441e Fix php compatibility 2021-11-28 15:34:08 +01:00
stickler-ci
a933793b8a Fixing style errors. 2021-11-28 13:42:25 +00:00
fr69400
5a165ae2bf FIX PDF_NOLD_PRODUCT_LABEL 2021-11-28 14:40:15 +01:00
ATM john
e97e0e4f17 Fix remove not used propertie 2021-11-28 12:18:09 +01:00
ATM john
29437a22b9 Fix comment and remove not use global 2021-11-28 12:15:31 +01:00
ptibogxiv
f08adef1e8
Fix ExpenseReport define template
Can use template for expense report notification but not define it :/
2021-11-28 12:12:16 +01:00
ATM john
a75ae6a8cf Fix missing formsetup elements 2021-11-28 12:11:03 +01:00
Laurent Destailleur
af1baf057b FIX #yogosha7789 2021-11-28 12:01:42 +01:00
Laurent Destailleur
27ae8f61bd FIX Check on Stripe REAL amount currency before validating membership 2021-11-27 19:04:39 +01:00
Laurent Destailleur
309f7da7ba Add log hidden into result page 2021-11-27 18:29:31 +01:00
Francis Appels
5bb21a93a1 FIX fatal error on cron list. 2021-11-27 18:25:38 +01:00
Laurent Destailleur
54e335937f FIX Bad redirect url for payment of members after public registration 2021-11-27 18:05:41 +01:00
Laurent Destailleur
6e27abaed9 FIX redirect to payment page when membership payment mode forced 2021-11-27 17:19:16 +01:00
Klaas Oldenburger
2030d55c67
Update main.lang
Did not complete earlier work.
2021-11-27 16:42:53 +01:00
Laurent Destailleur
66d9964861 Clean code 2021-11-27 16:19:12 +01:00
Laurent Destailleur
2acfba25ee Comment dead code 2021-11-27 15:58:14 +01:00
Laurent Destailleur
962ac263ba Fix look and feel v15 2021-11-27 15:29:48 +01:00
Laurent Destailleur
72493a5663 Fix typo 2021-11-27 15:13:36 +01:00
Laurent Destailleur
4376934e00 css 2021-11-27 14:56:21 +01:00
Laurent Destailleur
7b68ef1fb8 Clean/Debug module hrm. 2021-11-27 14:46:47 +01:00
Laurent Destailleur
f3f91512ae FIX eclude of log files into backup 2021-11-27 12:36:35 +01:00
Laurent Destailleur
6e273e47e5 css 2021-11-27 12:35:30 +01:00
Laurent Destailleur
d395fac13b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-27 10:58:12 +01:00
Laurent Destailleur
57670108bf Prepare code to zip a module 2021-11-27 10:57:45 +01:00
Laurent Destailleur
7cc9398661 css 2021-11-27 01:24:32 +01:00
Laurent Destailleur
654e20e9fb CSS 2021-11-27 01:11:59 +01:00
Laurent Destailleur
dd953b6e5a Fix filter 2021-11-27 01:09:16 +01:00
Laurent Destailleur
734c9871ad Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-11-27 01:07:32 +01:00
Marc de Lima Lucio
f5343c55c3 FIX: holiday mass deletion: correct return of record deleted 2021-11-26 18:23:31 +01:00
Marc de Lima Lucio
1361abffe5 FIX: holiday list: only mass delete if leave request is not in draft, canceled or refused, like in card 2021-11-26 18:22:31 +01:00
Laurent Destailleur
f67c2e5b53 Removed useless button 2021-11-26 17:20:19 +01:00
Laurent Destailleur
4548b4fcee css 2021-11-26 17:09:07 +01:00
Laurent Destailleur
ad8b071e81 Prepare code 2021-11-26 14:13:29 +01:00
Ferran Marcet
5265cd8084 Fix: correctly display the products of a warehouse in the pdf 2021-11-26 12:49:07 +01:00
Ferran Marcet
419eaa217f dejar igual que 13 2021-11-26 12:38:09 +01:00
Ferran Marcet
ad1d553d11 Merge branch '13.0up' into 13.0
# Conflicts:
#	htdocs/core/modules/modAdherent.class.php
#	htdocs/core/modules/modProduct.class.php
#	htdocs/core/modules/modProjet.class.php
#	htdocs/core/modules/modResource.class.php
#	htdocs/core/modules/modService.class.php
#	htdocs/core/modules/modSociete.class.php
#	htdocs/core/modules/modUser.class.php
2021-11-26 12:29:38 +01:00
Laurent Destailleur
0c8e2be4bd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-25 21:55:25 +01:00
Laurent Destailleur
bf1dfac629 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/errors.lang
	htdocs/product/stock/movement_list.php
2021-11-25 21:54:06 +01:00
Laurent Destailleur
198c530179 Fix syntax error 2021-11-25 21:51:07 +01:00