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

94237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d047cf488d Fix price2num 2021-01-31 12:51:11 +01:00
Laurent Destailleur
7887d4cc8e Fix price2num on all GETPOST('remise_percent') 2021-01-31 12:48:40 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
 2021-01-31 12:03:39 +01:00
Laurent Destailleur
044b4eee48 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/list.php
 2021-01-31 11:54:45 +01:00
Laurent Destailleur
244ee05a9c FIX #14290 #15900 2021-01-30 18:09:13 +01:00
Laurent Destailleur
58dec39f94 Fix start and end month for turnover report. 2021-01-30 17:07:13 +01:00
Laurent Destailleur
215752a93c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-30 14:04:14 +01:00
Laurent Destailleur
aa4956caef Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-30 13:57:53 +01:00
Laurent Destailleur
ca7738c9b3 FIX #16107 2021-01-30 13:57:42 +01:00
Laurent Destailleur
2b59a20ce1
Merge pull request #15988 from atm-lena/13.0_FIX_Merge_Societe 
FIX Societe Merge : "unknow column fk_soc" + "Delivery" label
 2021-01-30 13:22:00 +01:00
Laurent Destailleur
6fe5c2f599
Merge pull request #16109 from grandoc/new_branch_30_01_2021 
missing declaration
 2021-01-30 13:08:56 +01:00
Laurent Destailleur
4f73d26f6a
Merge pull request #16094 from aspangaro/12p1 
FIX: Accountancy - label_operation is used instead of label_compte
 2021-01-30 13:04:54 +01:00
Laurent Destailleur
ce82e1f11c
Merge pull request #16093 from atm-gauthier/NEW_develop/fk_user_on_social_charge 
NEW Can set an employee on each social contribution
 2021-01-30 13:04:00 +01:00
Laurent Destailleur
96aa0b946d
Merge pull request #16106 from fappels/13_fix_create_mo 
FIX: 13 create MO, Column 'tms' cannot be null
 2021-01-30 12:59:07 +01:00
Philippe GRAND
e584792382 missing declaration 2021-01-30 12:57:06 +01:00
Laurent Destailleur
1063b97c22 Close #16099 Close #16098 2021-01-30 12:55:38 +01:00
Philippe GRAND
0f19a11ebe missing declaration 2021-01-30 12:54:10 +01:00
Laurent Destailleur
06b0b0ac66
Merge pull request #16102 from bb2a/bug_PROPOSALS_WITH_PICTURE 
Bug Photo in propal
 2021-01-30 12:51:33 +01:00
Laurent Destailleur
6db7a840bc
Merge pull request #16103 from bb2a/patch-1 
Bug Photo in propal
 2021-01-30 12:50:56 +01:00
Laurent Destailleur
ccf2832938 Clean code 2021-01-30 12:45:43 +01:00
Francis Appels
2436e7c5b2 FIX: 13 create MO, Column 'tms' cannot be null 2021-01-29 19:39:50 +01:00
atm-lena
cfca26a727 Fix fix 2021-01-29 16:20:43 +01:00
Anthony Berton
66dde099ed Merge branch 'bug_PROPOSALS_WITH_PICTURE' of https://github.com/bb2a/dolibarr into bug_PROPOSALS_WITH_PICTURE 2021-01-29 15:40:22 +01:00
Anthony Berton
6b62d03993
Update pdf_cyan.modules.php 2021-01-29 13:56:04 +01:00
Anthony Berton
e48fc6c3d0 Update pdf_cyan.modules.php 2021-01-29 13:51:06 +01:00
Laurent Destailleur
215e36bb2e Fix typo 2021-01-29 11:19:33 +01:00
Anthony Berton
77b0075d71
Update pdf_azur.modules.php 2021-01-29 10:50:11 +01:00
Anthony Berton
720a11877d Update pdf_azur.modules.php 2021-01-29 10:48:58 +01:00
stickler-ci
400243a157 Fixing style errors. 2021-01-29 09:41:05 +00:00
Anthony Berton
fcf72d5e50 Update pdf_azur.modules.php 2021-01-29 10:35:48 +01:00
Gauthier PC portable 024
b55cb826e7 Merge branch 'NEW_develop/fk_user_on_social_charge' of github.com:atm-gauthier/dolibarr into NEW_develop/fk_user_on_social_charge 2021-01-29 09:33:06 +01:00
Gauthier PC portable 024
2915bf89d9 FIX : stickler feedback on br tag 2021-01-29 09:32:00 +01:00
Alexandre SPANGARO
413fc95f9a FIX: Accountancy - label_operation is used instead of label_compte 2021-01-28 23:40:15 +01:00
Laurent Destailleur
086b23f66c Fix responsive 2021-01-28 23:29:49 +01:00
Laurent Destailleur
4812dd2743 Fix responsive 2021-01-28 23:28:33 +01:00
Laurent Destailleur
83dc1e8cd0 Fix responsive 2021-01-28 23:27:29 +01:00
Laurent Destailleur
6544ba010e Fix responsive 2021-01-28 23:27:01 +01:00
Laurent Destailleur
0ead5abaa8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/stripe/class/stripe.class.php
 2021-01-28 23:22:35 +01:00
Laurent Destailleur
f8380090ed Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-28 23:18:34 +01:00
Laurent Destailleur
6ed3a1c227 Fix idempotencey make stripe payment fails 2021-01-28 23:18:10 +01:00
Laurent Destailleur
62622a2065 Fix: It was no more possible to create paymentintent for offline payment 2021-01-28 23:16:24 +01:00
Laurent Destailleur
848b4db509 Fix regression: It was not more possible to create payment offline 2021-01-28 23:13:43 +01:00
Laurent Destailleur
616a66702c Try a fix to solve offline payment problems 2021-01-28 22:32:00 +01:00
Laurent Destailleur
f3af16f208 Typo 2021-01-28 22:30:13 +01:00
Laurent Destailleur
3571b868fe Add log 2021-01-28 22:10:38 +01:00
Laurent Destailleur
1ea1dd9c33 Add doc 2021-01-28 22:06:13 +01:00
Laurent Destailleur
1a27480927 Test to fix a regression 2021-01-28 22:01:39 +01:00
Laurent Destailleur
6306b30499 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/mails.php
 2021-01-28 19:54:19 +01:00
Laurent Destailleur
1a52eb5ffa Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-28 19:52:17 +01:00
Laurent Destailleur
099fcd7e4e Fix test email 
Conflicts:
	htdocs/admin/mails.php
 2021-01-28 19:51:54 +01:00