Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

478 Commits

Author SHA1 Message Date
Laurent Destailleur
e3671da37f Fix edit shipment line when line is a not predefined product 2017-12-01 14:33:06 +01:00
Laurent Destailleur
c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php
 2017-11-14 19:47:33 +01:00
Laurent Destailleur
b5196b7164 FIX A lot of several fix on local taxes and NPR tax 2017-11-13 14:24:40 +01:00
Laurent Destailleur
feb04b4a22 Merge branch 'develop' into 7.0_new_shipment_update 2017-11-02 15:43:31 +01:00
Laurent Destailleur
1b28c45e2c PERF Links in getNomUrl use only one tag a instead of 2. 2017-11-02 15:19:14 +01:00
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
fappels
28604b4d82 New add delete lot 
Add empty lot row for adding new lot
When lot qty 0, lot will be deleted from line.
 2017-11-02 11:44:36 +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
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
202712be94 Work on module builder 2017-10-25 22:02:07 +02: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
7f7e621ea9 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update 2017-10-24 10:53:34 +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
728e36f70f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/api/index.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/class/api_invoices.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/actions_sendmails.inc.php
 2017-10-22 01:43:33 +02:00
fappels
2ea687a60b Add Line triggers, Improve line error handling, ... 
Add triggers,
Improve line error handling,
use line->insert in create_line
 2017-10-18 17:01:17 +02:00
Juanjo Menent
df53870c01 FIX: Bad localtax apply 2017-10-18 12:13:32 +02:00
Juanjo Menent
4382642099 FIX: Bad localtax apply 2017-10-18 12:10:00 +02:00
fappels
907ae36cdf Add insert, update and delete methods to line class 
Cleanup properties
Add insert, line and delete methods
 2017-10-15 17:58:22 +02:00
TuxGasy
6455e6d472 Use billed field from database on fetch shipping 2017-10-12 21:19:24 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-07 11:09:31 +00:00
Laurent Destailleur
801a5180d6 Fix scrutinizer bug reports 2017-10-06 01:16:19 +02:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
TuxGasy
5b154946a8 fix missing error on stock mouvment with batch 2017-07-04 21:48:38 +02:00
TuxGasy
9f50882d6d fix incorrect indent 2017-07-04 21:45:38 +02:00
TuxGasy
c8d039508f Fix missing error message 2017-07-03 14:01:11 +02:00
Laurent Destailleur
50bf1bb21f Fix error in count of qty in other shipments 2017-06-27 16:41:57 +02:00
Laurent Destailleur
693b2fe3b4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
 2017-06-23 11:20:29 +02:00
Laurent Destailleur
45004493e0 Fix multicurrency and vat_src_code not propaged on invoice from 
shipment.
 2017-06-23 11:12:17 +02:00
atm-ph
6b4e22ec3c Fix 6910 if conf PROJECT_USE_SEARCH_TO_SELECT is used we got BadFirstParameterForGETPOST 2017-06-10 16:07:56 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
absnc
7b784a1dcb Enable shipments for project overview tab 2017-05-19 17:50:10 +11:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Marcos García de La Fuente
e0cbcadd98 In case Model for document generation is not defined, the criteria to select the model is now: 
1. Model for the object
 2. Custom default module
 3. Hardcoded default module
 2017-01-16 21:16:05 +01:00
fappels
0aacb7ce17 Filter stock on warehouse status for shipping 
Do not show stock of closed and internal warehouse.
 2016-12-05 18:14:03 +01:00
Laurent Destailleur
ecbe719f23 FIX Several problems into shipment management with lot enabled 2016-11-14 13:40:41 +01:00
Laurent Destailleur
019125f258 Uniformize code 2016-11-02 10:29:14 +01:00
Laurent Destailleur
a3607fff77 Fix customer ref of shipment 2016-10-30 16:34:46 +01:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Sergio Sanchis
81a31e8390 Fix: Need declare $user for call trigger 2016-10-18 10:52:07 +02:00
Laurent Destailleur
b412baa880 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-29 10:49:47 +02:00
fappels
3d58b0aef6 Fix livraison eatby and sellby parameters are dates 2016-09-28 00:22:29 +02:00
aspangaro
922495d72d Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
fappels
7c772b7608 Fix insert expeditiondet_batch with extrafield 
Line id of extraflied was used iso expeditiondet
 2016-09-07 14:07:29 +02:00
florian HENRY
d6be1cebcb work on going 2016-09-07 12:41:32 +02:00