Commit Graph

83748 Commits

Author SHA1 Message Date
Laurent Destailleur
5d7fa55759 css 2020-01-24 17:48:24 +01:00
Laurent Destailleur
de4183ea65 Update logos 2020-01-24 17:30:46 +01:00
Laurent Destailleur
209ebfbe2f Fix trans 2020-01-24 16:14:52 +01:00
Laurent Destailleur
923e315dae Debug cashfence feature 2020-01-24 15:59:36 +01:00
gauthier
4222639702 FIX : Extrafield position in export field list must respect "pos" field 2020-01-24 15:32:59 +01:00
Laurent Destailleur
779cd94b0e Debug cashfence feature 2020-01-24 15:26:18 +01:00
atm-greg
f63893a90c FIX date filter not used if no operator 2020-01-24 15:10:57 +01:00
Laurent Destailleur
17f28189f9 Virtual stock must include Manufacturing Orders 2020-01-24 14:51:45 +01:00
atm-greg
f5395fa859 fix lost name_alias on country selection 2020-01-24 14:28:08 +01:00
AdrianDominik
63f5a75bd0 Merge remote-tracking branch 'upstream/11.0' into 11.0 2020-01-24 13:47:42 +01:00
florian HENRY
2f0144b19b Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11_fixWithdrwLineList 2020-01-24 13:22:24 +01:00
florian HENRY
dc3eafccb9 add hook into withdraw list 2020-01-24 13:22:04 +01:00
gauthier
1f18c93b9f FIX : thirdparty alias name desappeared if we change country with THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION conf 2020-01-24 12:06:22 +01:00
Francis Appels
474849ef30 Merge remote-tracking branch 'Dolibarr/11.0' into 11 2020-01-24 10:51:39 +01:00
Alexandre SPANGARO
354b784279 NEW: Add hook on margin list page 2020-01-24 09:57:17 +01:00
stickler-ci
cfa67b6a5d Fixing style errors. 2020-01-24 08:47:11 +00:00
simicar29
bab81f5d34
Merge pull request #2 from simicar29/simicar29-patch-3
Add Hook doPreMassActions
2020-01-24 09:43:34 +01:00
simicar29
4761671fc8
Add Hook doPreMassActions
Add Hook doPreMassActions to allow dedicated form display for custom mass actions
2020-01-24 09:41:22 +01:00
simicar29
65cc1202ce
Update "submitted only" module options
Don't update to the null value options absent from the posted parameters.
2020-01-24 09:23:08 +01:00
javierybar
c46f255408
TakePOS price rounding 2020-01-24 09:22:46 +01:00
Laurent Destailleur
540713510e Fix load of segment prices not required for virtual stock change
virtual stock must include production (WIP)
2020-01-23 21:03:15 +01:00
Laurent Destailleur
12b4909c45 Fix load of segment prices not required for virtual stock change
virtual stock must include production (WIP)
2020-01-23 20:59:18 +01:00
Laurent Destailleur
f2ab3426ea Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-23 19:42:22 +01:00
Laurent Destailleur
e1123c63a9 Fix field label 2020-01-23 19:42:00 +01:00
Laurent Destailleur
df90e432d4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/sociales/card.php
2020-01-23 19:39:05 +01:00
Laurent Destailleur
b74d37338b Fix trans 2020-01-23 19:37:34 +01:00
Laurent Destailleur
a44d534e64 Fix label 2020-01-23 19:32:34 +01:00
Laurent Destailleur
f59cb65a21 Fix label 2020-01-23 19:32:15 +01:00
Laurent Destailleur
423be8a139 FIX Label of status of social contribution 2020-01-23 19:30:02 +01:00
Laurent Destailleur
5d4ea0b4c4 FIX Label of status of social contribution 2020-01-23 19:28:56 +01:00
florian HENRY
62caf3cbfc fix create SEPA withdraw with limit select and working pagination 2020-01-23 17:59:50 +01:00
florian HENRY
5ad5578f40 fix create SEPA withdraw with limit select and working pagination 2020-01-23 17:47:00 +01:00
florian HENRY
210e0511d0 fix create SEPA withdraw with limit select and working pagination 2020-01-23 17:45:16 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
2020-01-23 17:41:31 +01:00
Laurent Destailleur
b3bbb23dae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/smtps.class.php
2020-01-23 17:38:14 +01:00
Laurent Destailleur
8030558117 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/class/smtps.class.php
2020-01-23 17:34:40 +01:00
Laurent Destailleur
42769e2e7d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-01-23 17:30:30 +01:00
Laurent Destailleur
7ee37ddd3f FIX Error in log for email sending with smtps was not complete 2020-01-23 17:30:05 +01:00
florian HENRY
fd0daad959 fix SEPA line with limit select and working pagination 2020-01-23 16:49:06 +01:00
ptibogxiv
13045748f3
fix sql on order list 2020-01-23 15:26:22 +01:00
AdrianDominik
d302f190a7 Fix: strict mode mysql compatibility 2020-01-23 13:29:28 +01:00
gti-eu
67e57b8da2
Add trackid to Ticket message mail 2020-01-23 12:53:24 +01:00
Laurent Destailleur
7ad827f212 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
2020-01-23 12:09:01 +01:00
Laurent Destailleur
be344518c4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/lib/functions2.lib.php
2020-01-23 12:07:17 +01:00
Laurent Destailleur
3a9ef7c5e7
Merge pull request #12911 from aspangaro/9.0_FEC
FIX: FEC export format
2020-01-23 12:04:55 +01:00
Laurent Destailleur
cbe396b97c
Update functions2.lib.php 2020-01-23 12:04:14 +01:00
Laurent Destailleur
1487158082
Update functions2.lib.php 2020-01-23 12:02:29 +01:00
Laurent Destailleur
646ccc1354 Fix error management 2020-01-23 11:52:00 +01:00
gti-eu
40febd2781
Fix reference check on emailcollector
ObjectType is on reg[1]
ObjectId is on reg[2]
2020-01-23 11:48:44 +01:00
Alexandre SPANGARO
7f47b48559 Move function to functions2.lib.php 2020-01-23 11:47:30 +01:00