Commit Graph

94220 Commits

Author SHA1 Message Date
Francis Appels
731ca02789 Use new origin field to mark free lines.
Allow add free line when production started
2021-02-02 11:19:58 +01:00
Francis Appels
45970ac443 Update database with new fields 2021-02-02 11:13:14 +01:00
Francis Appels
bf305d7083 create MO, Column 'tms' cannot be null 2021-01-30 17:28:21 +01:00
Francis Appels
060ddff883 Add missing pmp valorisation to MO production. (Issue #16072) 2021-01-30 17:27:16 +01:00
Francis Appels
b1cd6c5ecf mo line is line so no fetchLines 2021-01-30 16:39:28 +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
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
Philippe GRAND
e584792382 missing declaration 2021-01-30 12:57:06 +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
ccf2832938 Clean code 2021-01-30 12:45: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
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
Laurent Destailleur
4812dd2743 Fix responsive 2021-01-28 23:28:33 +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
Laurent Destailleur
1764d3528b Fix test email 2021-01-28 19:45:52 +01:00
Laurent Destailleur
f6aacf7656 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-28 19:39:25 +01:00
Laurent Destailleur
e5b4c76a26 Fix combo to select action status 2021-01-28 19:38:47 +01:00
Laurent Destailleur
4c3dc6be1b Fix can't use the link button twice. 2021-01-28 19:38:06 +01:00
stickler-ci
b4d0668cea Fixing style errors. 2021-01-28 16:27:55 +00:00
Gauthier PC portable 024
5adcc3361b FIX : credits 2021-01-28 17:24:47 +01:00
Gauthier PC portable 024
d364755792 NEW : migration script 2021-01-28 17:20:01 +01:00
Gauthier PC portable 024
0c43ea1e9b Merge branch 'NEW/fk_user_on_social_charge' of github.com:atm-gauthier/dolibarr into NEW_develop/fk_user_on_social_charge 2021-01-28 17:16:24 +01:00
Gauthier PC portable 024
cce38a9e6d NEW : fk_user on social charge 2021-01-28 16:58:55 +01:00
Laurent Destailleur
98447c4c5f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-28 16:32:28 +01:00
Laurent Destailleur
db9b6b53da NEW Can set a label as placeholder for combo lists. 2021-01-28 16:31:32 +01:00
Laurent Destailleur
32c33b72d6 FIX Sql error in group by with postgresql 2021-01-28 16:10:13 +01:00
Laurent Destailleur
745e2be678 FIX encoding status in graph of vendor proposals 2021-01-28 16:00:22 +01:00
Laurent Destailleur
f3c33be871 Fix css 2021-01-28 15:47:32 +01:00
Laurent Destailleur
9ec5ba46fb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
2021-01-28 14:47:06 +01:00
Laurent Destailleur
d3c94a0edb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/fourn/commande/dispatch.php
2021-01-28 14:21:48 +01:00