Commit Graph

62662 Commits

Author SHA1 Message Date
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
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
fappels
cd5c678534 Only update new lot number 2017-10-29 19:01:42 +01:00
fappels
6bf57962dc Fix travis 2017-10-24 15:48:22 +02:00
fappels
eaf3958be7 Revert "Add entrepot id to expedition batch fetchAll"
This reverts commit 5342785a49.
2017-10-24 15:45:49 +02:00
fappels
914b8c1c71 cleanup 2017-10-24 11:45:11 +02:00
fappels
0c38944daa Fix delete multi warehouse line 2017-10-24 11:37:17 +02:00
fappels
7f7e621ea9 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update 2017-10-24 10:53:34 +02:00
fappels
ba189277ee Fix update extrafield 2017-10-24 10:53:11 +02:00
fappels
b2cd2290e1 Update card for line update 2017-10-23 22:18:15 +02:00
fappels
fe2acb2cb6 Add form select for lot numbers 2017-10-23 22:17:24 +02:00
fappels
5342785a49 Add entrepot id to expedition batch fetchAll 2017-10-23 22:16:40 +02:00
fappels
6571083a78 Add line id to detail_entrepot object
Add line id to detail_entrepot object.
Add expedition batch id to update batch in line update
2017-10-23 22:16:00 +02:00
Laurent Destailleur
28ae602b7e NEW Chart of account is loaded when selected into accounting setup 2017-10-23 20:42:09 +02:00
Laurent Destailleur
e0c9c00827 Add field to list 2017-10-23 20:17:57 +02:00
Laurent Destailleur
2a75f09070 NEW Use autocompletion on selection of chart of account 2017-10-23 20:14:14 +02:00
Laurent Destailleur
ef628025d2 NEW Add and edit country for chart of accounts systems 2017-10-23 20:01:38 +02:00
Laurent Destailleur
9df3f5c75e Migration of data 2017-10-23 19:18:17 +02:00
Laurent Destailleur
f083ac5e6b Prepare database to store country int accounting_system table 2017-10-23 18:56:09 +02:00
Laurent Destailleur
a4b152ff1b Fix get lines of contracts done in one request instead of 2 2017-10-23 13:28:45 +02:00
Laurent Destailleur
53d2f29cdd Fix regression 2017-10-23 10:27:50 +02:00
Laurent Destailleur
109d9cab85 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-23 10:21:56 +02:00
Laurent Destailleur
f675be650e Fix missing field in migration v6 2017-10-23 10:21:45 +02:00
Laurent Destailleur
ead08c17d8 Discard loading of chart of account 2017-10-22 23:52:50 +02:00
Laurent Destailleur
3ccf782b41 More accurate return code 2017-10-22 21:25:59 +02:00
Laurent Destailleur
7825cc9f6d Fix to avoid infinite loop 2017-10-22 21:21:24 +02:00
Laurent Destailleur
f4f47c6732 NEW Remove tooltip tipTip library replaced with standatd jquery tooltip 2017-10-22 21:15:08 +02:00
Laurent Destailleur
285203ed0e Reduce diplicate code 2017-10-22 17:00:35 +02:00
Laurent Destailleur
36ad17cc95 Work on module builder 2017-10-22 16:45:18 +02:00
Laurent Destailleur
812687e10c FIX Restore feature to enable a module during CLI upgrade 2017-10-22 16:08:52 +02:00
Laurent Destailleur
1fe1cb986a Fix AUTO_INCREMENT PRIMARY KEY does not need NOT NULL 2017-10-22 15:51:07 +02:00
Laurent Destailleur
b3fb348b0e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-22 15:42:31 +02:00
Laurent Destailleur
c6e5115d34 Set default limit to 100 on all rest api that list 2017-10-22 15:42:19 +02:00
Laurent Destailleur
efb369f857 Merge pull request #7497 from atm-florian/dev_accountancy
NEW : lettrage in accountancy
2017-10-22 15:28:53 +02:00
Laurent Destailleur
b9bbba813a Update company.lib.php 2017-10-22 15:28:03 +02:00
Laurent Destailleur
98674f6d82 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/facture/card.php
	htdocs/societe/class/api_contacts.class.php
	htdocs/societe/class/api_thirdparties.class.php
2017-10-22 15:01:35 +02:00
Laurent Destailleur
79279caa2e FIX #7619 2017-10-22 14:56:00 +02:00
Laurent Destailleur
745c4625a6 FIX #7619 2017-10-22 14:48:42 +02:00
Laurent Destailleur
f3c6442a93 Code comment 2017-10-22 14:44:50 +02:00
Laurent Destailleur
be0cd601a9 Fix dead code 2017-10-22 14:07:54 +02:00
Laurent Destailleur
78ffe15a04 Code comment 2017-10-22 14:03:59 +02:00
Laurent Destailleur
703d4a6aee FIX #7648 2017-10-22 14:02:24 +02:00
Laurent Destailleur
097d5fd623 Fix phpunit 2017-10-22 13:12:06 +02:00
Laurent Destailleur
4247038d01 Add phpunit test 2017-10-22 13:06:27 +02:00
Laurent Destailleur
83c1928034 Fix duplicate methods 2017-10-22 12:21:44 +02:00
Laurent Destailleur
cb4d863e83 Fix phpunit 2017-10-22 04:34:28 +02:00
Laurent Destailleur
a8443e1614 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-22 04:23:51 +02:00
Laurent Destailleur
4a1834ee29 #7411 2017-10-22 04:23:17 +02:00
Laurent Destailleur
d3f2e19691 Merge pull request #7680 from Nicos-git/OdtGeneration
NEW Add product unit fields for ODT substitution
2017-10-22 04:14:17 +02:00
Laurent Destailleur
ba2dd953b4 Update commondocgenerator.class.php 2017-10-22 04:13:49 +02:00