Commit Graph

89109 Commits

Author SHA1 Message Date
gauthier
4c0de74470 FIX : sort by default role makes no sense 2020-03-24 16:27:53 +01:00
florian HENRY
21febcc8fc fix extrafeild creation 2020-03-24 16:09:18 +01:00
Laurent Destailleur
1657a6b50a FIX actions on supplier proposal not saved (bad trigger name)
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-03-24 15:00:13 +01:00
Laurent Destailleur
d922eb270d FIX actions on supplier proposal not saved (bad trigger name) 2020-03-24 13:25:45 +01:00
Laurent Destailleur
a5379c7144 FIX All forms must use newToken()
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9 FIX All forms must use newToken() 2020-03-24 13:10:35 +01:00
Laurent Destailleur
2b33ef7e46 Align color of graph of status on status color 2020-03-24 13:06:59 +01:00
Maxime Kohlhaas
bcbccf0c83 Start working on bom cost 2020-03-24 10:32:31 +01:00
andreubisquerra
58a10c9c16
Unnecessary line 2020-03-23 23:10:55 +01:00
andreubisquerra
585c46b181
Avoid print customer name when is default 2020-03-23 22:58:04 +01:00
andreubisquerra
53850caa87
No reload page to load other sale in TakePOS 2020-03-23 22:44:26 +01:00
Laurent Destailleur
f56de9f177 Fix autocalculation of timespent in monthy mode 2020-03-23 22:04:40 +01:00
Laurent Destailleur
063cf15bcb Clean code 2020-03-23 20:16:51 +01:00
Laurent Destailleur
f4a52470e3 Graph use color of status 2020-03-23 19:46:43 +01:00
Laurent Destailleur
c2f0cdc0f6 Look and feel v12. Several minor fixes 2020-03-23 19:35:14 +01:00
Laurent Destailleur
820a21a721 Simple setup tutorial 2020-03-23 18:35:22 +01:00
Laurent Destailleur
16ddc56353 FIX #12277 2020-03-23 17:47:30 +01:00
Laurent Destailleur
8f07fc0550 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-23 17:39:46 +01:00
Laurent Destailleur
b9088c1ce3 css 2020-03-23 17:39:35 +01:00
Laurent Destailleur
c249a1af14
Merge pull request #13408 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
2020-03-23 17:39:09 +01:00
Laurent Destailleur
2a310b09af Fix phpcs 2020-03-23 17:24:47 +01:00
Laurent Destailleur
b18d3e5588 Fix var not defined 2020-03-23 15:58:47 +01:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
0905b3a6b2 Fix function not found 2020-03-23 15:46:16 +01:00
Laurent Destailleur
716777f364 Fix scrutinizer errors 2020-03-23 15:43:41 +01:00
Laurent Destailleur
01e60562b9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/takepos/takepos.php
2020-03-23 15:38:10 +01:00
Laurent Destailleur
db6cb2d449 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-23 15:34:03 +01:00
Laurent Destailleur
24dc202022 Doc 2020-03-23 15:33:52 +01:00
Laurent Destailleur
1e955a89ef FIX #13399 after #13285 and #13183 2020-03-23 15:28:18 +01:00
Laurent Destailleur
0dbc37667c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-23 15:25:42 +01:00
Laurent Destailleur
ca4b641094 FIX #13407 2020-03-23 15:24:29 +01:00
Laurent Destailleur
e4a9763f54
Merge pull request #13405 from aspangaro/12.0_a25
Qual: Move supplier proposal menu to the core
2020-03-23 15:17:10 +01:00
Laurent Destailleur
55dd3ae0ae
Merge pull request #13403 from andreubisquerra/11.0
Fix TakePOS DirectPayment when place is higher 0
2020-03-23 15:13:35 +01:00
Laurent Destailleur
04a875f43b
Merge pull request #13404 from hregis/10.0_mc2
FIX remove unused var, $usercancreate can be change by Multicompany
2020-03-23 15:13:19 +01:00
Laurent Destailleur
aab3ca4fa1
Merge pull request #13402 from andreubisquerra/develop
Fix TakePOS DirectPayment when place is higher 0
2020-03-23 15:12:38 +01:00
Laurent Destailleur
d662bb97dc Debug parallel sale feature 2020-03-23 15:02:15 +01:00
Laurent Destailleur
d965aad6e6 Some fix to support correctly parallel sales 2020-03-23 14:31:59 +01:00
Laurent Destailleur
2177afecd9 Sort order 2020-03-23 14:12:48 +01:00
Alexandre SPANGARO
89de39f199 Move supplier proposal menu to the core 2020-03-23 08:51:38 +01:00
Regis Houssin
45579b0986 FIX remove unused var, $usercancreate can be change by Multicompany 2020-03-23 07:01:23 +01:00
Alexandre SPANGARO
d5729e6dcc Work on split module fournisseur 2020-03-23 05:53:33 +01:00
Alexandre SPANGARO
7d22ccbd12 Merge remote-tracking branch 'upstream/develop' into 12.0_a23 2020-03-23 05:50:07 +01:00
Alexandre SPANGARO
e6a59dcdbb Work on split module fournisseur 2020-03-23 05:43:41 +01:00
andreubisquerra
fbe6711353
Fix TakePOS DirectPayment when place is higher 0 2020-03-22 22:46:40 +01:00
andreubisquerra
618da0a808
Fix TakePOS DirectPayment when place is higher 0 2020-03-22 22:39:41 +01:00
Laurent Destailleur
94b6fbb223 FIX #13300 2020-03-22 20:52:00 +01:00
Laurent Destailleur
26e9500c26 FIX #13300 2020-03-22 20:50:50 +01:00
Laurent Destailleur
b3e87e89b7 Add more excluding tags 2020-03-22 20:35:47 +01:00
Laurent Destailleur
ef86311639
Merge pull request #13224 from mapiolca/patch-38
# Fix Compatibility with NOTMODIFYOTHERENTITYFOURNPRICE const.
2020-03-22 20:32:15 +01:00
Laurent Destailleur
f20e0efe06 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-22 20:22:41 +01:00