lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
94,008 Commits 43 Branches 150 Tags 886 MiB
89dbd745bf
Commit Graph

94008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
89dbd745bf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/modAccounting.class.php
 2021-03-31 13:53:36 +02:00
Laurent Destailleur
1880cb92a4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-31 13:47:00 +02:00
Laurent Destailleur
ddaaabfb7a
Merge pull request #17054 from aspangaro/12p13 
FIX: Accountancy - Import in general ledger
 2021-03-31 13:46:04 +02:00
Laurent Destailleur
521dec7792
Merge pull request #17018 from fmarcet/11.0 
FIX: Show Ref.Supplier in LinkToObjectBlock
 2021-03-31 13:44:53 +02:00
Laurent Destailleur
2bc6bde8cb
Merge pull request #17049 from FHenry/13_fix_receptionfourn 
fix : test on reception must be done on lineToTest if checked
 2021-03-31 13:41:19 +02:00
Ferran Marcet
b6faa6b605 FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-31 09:40:12 +02:00
Alexandre SPANGARO
14a62442c4 FIX: Accountancy - Import in general ledger 2021-03-31 05:07:05 +02:00
Florian HENRY
cd37d3440a fix : test on reception must be done on lineToTest if checked 2021-03-30 23:04:29 +02:00
Florian HENRY
0f6dae313d fix : test on reception must be done on lineToTest if checked 2021-03-30 23:02:53 +02:00
Ferran Marcet
b4f638602a FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-30 11:10:07 +02:00
Laurent Destailleur
2689bc938d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-29 21:40:01 +02:00
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
Laurent Destailleur
6ad7b12f89
Merge pull request #16973 from ksar-ksar/patch-1 
FIX #16843
 2021-03-29 16:25:18 +02:00
Laurent Destailleur
914580ed84
Merge pull request #16983 from aspangaro/13p31 
FIX Start hour on ACCOUNTING_DATE_START_BINDING
 2021-03-29 16:12:58 +02:00
Laurent Destailleur
b9a91f92ea
Merge pull request #16984 from aspangaro/10p38 
FIX Search on date in accountancy
 2021-03-29 16:12:31 +02:00
Alexandre SPANGARO
56ae51375d FIX Search on date in accountancy 2021-03-27 07:11:28 +01:00
Alexandre SPANGARO
1382323f77 FIX Start hour on ACCOUNTING_DATE_START_BINDING 2021-03-27 06:56:34 +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
ksar
ccd6d28f6f
FIX #16843 
https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4

fa-mail-forward => fa-share
 2021-03-25 14:39:42 +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
30543bda71
Merge pull request #16947 from atm-john/11.0_fix_something_that_not_exist 
FIX : shhhhhh ! There is nothing here...
 2021-03-25 01:09:20 +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
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