Commit Graph

62861 Commits

Author SHA1 Message Date
fappels
3e58f7c609 Fix create line extra fields 2017-10-31 17:20:29 +01:00
fappels
3f5112ff48 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update 2017-10-31 16:49:54 +01:00
fappels
f7df9e1d1f Fix travis 2017-10-31 16:49:39 +01:00
Laurent Destailleur
d39a19e976 Replace on/off img tick with fa-font 2017-10-31 12:32:30 +01:00
Laurent Destailleur
bd94ec0f1d Use fontawesome for picto for on/off default. 2017-10-31 12:25:06 +01:00
Laurent Destailleur
29bb0b37ef Translation 2017-10-31 11:50:56 +01:00
Laurent Destailleur
068f5e32cb NEW Tooltip for substitutions variables on tooltips on admin pages 2017-10-31 11:17:44 +01:00
Laurent Destailleur
32303d30fa Fix search on special char in module list 2017-10-31 10:46:23 +01:00
Laurent Destailleur
b29f32171c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/contrat/card.php
	htdocs/core/lib/project.lib.php
	htdocs/filefunc.inc.php
2017-10-30 18:22:26 +01:00
Laurent Destailleur
b7c5844d35 Update template 2017-10-30 17:40:34 +01:00
Laurent Destailleur
892798bf79 Code comment 2017-10-30 12:40:12 +01:00
fappels
08f931b73c Only show show lot from same src warehouse.
When shipping from multiple warehouse, only allow lot from same src
warehouse. (expeditiondet_batch is on to many from expeditiondet).
2017-10-30 12:39:06 +01:00
Laurent Destailleur
b74399abf6 Code comment 2017-10-30 02:56:40 +01:00
Laurent Destailleur
39506df4dd Add business_vat_id in stripe payment 2017-10-30 02:33:54 +01:00
Laurent Destailleur
007783cf76 FIX Searching translation should not be case sensitive 2017-10-30 01:45:39 +01:00
Laurent Destailleur
b11727885e Translation 2017-10-30 01:44:18 +01:00
Laurent Destailleur
9edc8f6eb6 FIX Searching translation should not be case sensitive 2017-10-30 01:32:17 +01:00
Laurent Destailleur
bbe1c9c494 NEW Can download PDF document from the payment page 2017-10-30 00:45:47 +01:00
Laurent Destailleur
76b0e7ee5a NEW Add option PROPOSAL/ORDER/INVOICE_ALLOW_EXTERNAL_DOWNLOAD 2017-10-29 21:24:54 +01:00
fappels
a9ceb46f97 Add parameter to load all lot from lines of object in cache
If you want use the lot stock selector in mutiple lines you can add
lines array. If you don't give a product id or a lines array, no lot
numbers will be loaded.
2017-10-29 20:40:56 +01:00
Laurent Destailleur
0d09e1d223 Enhance purge 2017-10-29 20:12:02 +01:00
Laurent Destailleur
bb5bfabd7d Enhance the script purge-data.php to purge remote database 2017-10-29 20:08:09 +01:00
fappels
cd5c678534 Only update new lot number 2017-10-29 19:01:42 +01:00
Laurent Destailleur
64107b7625 Include module name in generated sql files 2017-10-29 18:53:08 +01:00
Laurent Destailleur
02cae88a8c Fix date output 2017-10-29 17:50:50 +01:00
Laurent Destailleur
33aa0f3160 Code comment 2017-10-29 17:49:24 +01:00
Laurent Destailleur
0de1b878bd Prepare 6.0.4 2017-10-29 16:17:52 +01:00
Laurent Destailleur
78645c718f Fix position of quick search 2017-10-29 16:15:54 +01:00
Laurent Destailleur
75bbcdf575 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-29 11:29:01 +01:00
Laurent Destailleur
d569218162 Fix 'separate' extrafields must be visible by default.
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Laurent Destailleur
985a268477 Update doc 2017-10-28 22:10:56 +02:00
Laurent Destailleur
cd5e43483e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/lib/project.lib.php
	htdocs/expedition/card.php
	htdocs/projet/class/task.class.php
2017-10-28 22:08:16 +02:00
Laurent Destailleur
02f47b5a91 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-10-28 22:03:23 +02:00
Laurent Destailleur
4feecbeab8 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-10-28 22:03:06 +02:00
Laurent Destailleur
0630542e20
Merge pull request #7723 from atm-maxime/fix_contract_desc
Fix : contract lines from origin were containing all lines desc
2017-10-28 22:02:13 +02:00
Laurent Destailleur
783efd1a71
Merge pull request #7722 from fmarcet/4.0
FIX: paid supplier invoices are shown as abandoned
2017-10-28 22:01:30 +02:00
Laurent Destailleur
da1afa80cf
Merge pull request #7718 from Oeris/develop-api
FIX wrong paramters name in the usecreditnote method
2017-10-28 22:00:29 +02:00
Laurent Destailleur
5313d61847 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-10-28 20:35:35 +02:00
Laurent Destailleur
92c33b76dc Fix position of search element in quick search 2017-10-28 20:35:21 +02:00
Laurent Destailleur
46f95e14fa Fix select2 search 2017-10-28 17:34:46 +02:00
Laurent Destailleur
adc4db0f85 Standardize code 2017-10-28 16:55:25 +02:00
Laurent Destailleur
b9ca66943f Try to introduce param forcesandbox to test online payment easier 2017-10-28 16:32:19 +02:00
Laurent Destailleur
9676b83574 Google tag enabled also on mobile 2017-10-28 16:00:46 +02:00
Laurent Destailleur
00db7e16ec Clean code 2017-10-28 16:00:07 +02:00
Laurent Destailleur
9e382a7f1b Can disabled output of notify messages 2017-10-28 13:36:23 +02:00
Laurent Destailleur
1a49a2bb94 Clean css/code 2017-10-28 11:00:02 +02:00
Laurent Destailleur
9a5d532786 Fix website 2017-10-27 18:45:12 +02:00
Laurent Destailleur
013ab9405e Work on website module 2017-10-27 17:58:38 +02:00
Laurent Destailleur
815faf4c91 Fix css for website 2017-10-27 16:00:37 +02:00
Laurent Destailleur
01af1e3252 Work on website module 2017-10-27 15:42:48 +02:00