Commit Graph

62894 Commits

Author SHA1 Message Date
Laurent Destailleur
cfacfab6cf NEW Show badge with nbr of shipment on shimpen tab of order
NEW Add button cancel on shipment creation
2017-11-02 12:38:36 +01:00
Laurent Destailleur
cd8acf8f12 Fix CSS 2017-11-02 11:07:47 +01:00
Laurent Destailleur
5e657626c3
Merge pull request #7702 from fappels/7.0_new_shipment_update
NEW #5711 Add shipment line deleting and editing for draft shipments.
2017-11-02 11:00:45 +01:00
Laurent Destailleur
417642ba39 Standardize interface (search on date modification) 2017-11-02 10:33:04 +01:00
Laurent Destailleur
7efa780b82
Merge pull request #7743 from aspangaro/7.0-general_ledger
NEW General ledger : Add field date_creation and selected field
2017-11-02 10:14:21 +01:00
Laurent Destailleur
dbd85321b3
Merge pull request #7735 from grandoc/new_branc_30_10_17
Warning: trim() expects parameter 1 to be string, array given in /htt…
2017-11-02 09:58:57 +01:00
Laurent Destailleur
6ea558b639
Update functions.lib.php 2017-11-02 09:58:22 +01:00
Laurent Destailleur
d137cef843
Merge pull request #7707 from aspangaro/7.0-SPEC1
SPEC #7013 : use database type "double" to store monetary values
2017-11-02 09:54:34 +01:00
Laurent Destailleur
5df4912324 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
2017-11-02 09:45:13 +01:00
Laurent Destailleur
4755197503 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-11-02 09:42:47 +01:00
Laurent Destailleur
59df957181 Fix return HTTP code 501 if calling a non existing api 2017-11-02 01:43:27 +01:00
Laurent Destailleur
192dc43b87 Fix regression 2017-11-02 01:16:42 +01:00
Laurent Destailleur
91fbb4da41 Fix changelog 2017-11-01 20:12:15 +01:00
Laurent Destailleur
a6879775bb FIX Search into language is ok for file into external modules two. 2017-11-01 20:05:28 +01:00
Laurent Destailleur
e184cac2c5 FIX Search into language is ok for file into external modules two. 2017-11-01 19:58:46 +01:00
Laurent Destailleur
a98452ae36 Move translation 2017-11-01 10:52:42 +01:00
Laurent Destailleur
219364703f Sync transifex 2017-11-01 10:48:21 +01:00
Laurent Destailleur
f26d970d58 Remove option MAIN_HTML5_PLACEHOLDER (on by default now) 2017-11-01 10:17:24 +01:00
Alexandre SPANGARO
f9e801b4a7 Update works 2017-11-01 08:42:17 +01:00
Alexandre SPANGARO
7c0ff3a32f Merge remote-tracking branch 'uptream/develop' into 7.0-general_ledger 2017-11-01 07:58:20 +01:00
Laurent Destailleur
4220d02dd4 Debug module blocked log 2017-10-31 23:57:37 +01:00
Laurent Destailleur
9458c80c48 Work on reminders 2017-10-31 23:10:29 +01:00
Laurent Destailleur
1db68b2a32 Translation 2017-10-31 19:37:41 +01:00
Laurent Destailleur
2094ae1a57 NEW Add filter on event code on automatic filling setup page 2017-10-31 19:28:34 +01:00
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
Alexandre SPANGARO
a0d186bae6 Merge remote-tracking branch 'uptream/develop' into 7.0-SPEC1 2017-10-31 05:53:05 +01:00
Laurent Destailleur
3db101ffdd Clean packager 2017-10-31 01:06:07 +01:00
Laurent Destailleur
2b966e630b Doc 2017-10-30 19:49:48 +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
Philippe GRAND
f904c46a10 Warning: trim() expects parameter 1 to be string, array given in /httpdocs/core/lib/functions.lib.php on line 520 2017-10-30 14:22: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