Laurent Destailleur
96215ccea5
Fix bad operator for and
2015-02-03 13:05:28 +01:00
Laurent Destailleur
5c5ff72ecd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
aec1bdb3c4
Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice
2014-12-25 23:08:07 +01:00
Francis Appels
722fdaa4eb
Fix: check warehouse on product batch
...
Only check warehouse on actions 'create' and 'add'
2014-12-17 15:58:48 +01:00
Francis Appels
f7d2d0e81f
Revert "Fix: check warehouse on product batch"
...
This reverts commit a06c5b251e
2014-12-17 15:51:12 +01:00
Francis Appels
a06c5b251e
Fix: check warehouse on product batch
...
Only check warehouse when on actions 'create' and 'add'
2014-12-17 15:49:51 +01:00
Laurent Destailleur
849628f020
Fix: Typo and translation
2014-12-17 01:56:36 +01:00
Laurent Destailleur
a9338a0f9f
Fix: Maxi debug of module productbatch.
...
Conflicts:
htdocs/core/class/conf.class.php
htdocs/langs/en_US/productbatch.lang
2014-12-05 16:04:37 +01:00
Laurent Destailleur
5086450f35
Fix: Forging email content must use dol_concatdesc.
2014-11-02 12:32:38 +01:00
Laurent Destailleur
132ddf65d6
Fix: several bugs into document generation (default must be used in
...
priority when not template defined).
Fix: use first odt file when no odt file defined.
Fix: Must use output translation.
2014-10-27 19:37:30 +01:00
Laurent Destailleur
9c69ab966f
Fix: When closing shipment, status was not visible until refresh.
2014-10-18 16:27:15 +02:00
Francis Appels
1e6240953e
Fix increase stock on shipment validation
...
$obj not set.
Re-enabled delete button for shipment with batches, was increase issue,
not decrease issue.
2014-10-06 14:10:27 +02:00
Regis Houssin
a2446e51db
New: add context "globalcard" for declaring only once all cards
2014-10-06 07:20:58 +02:00
Francis Appels
840a98d8ac
Expedition lines from same orderline merged.
...
When there are more expedition lines from same orderline key, merge them
and get source warehouses. Usefull future possibility for creating
shippinglines with same products from multiple warehouses.
@KreizIT also changed some batch related items.
2014-10-03 12:20:02 +02:00
Laurent Destailleur
ec95aacd52
Uniformize code for error reporting after a hook.
2014-09-28 03:41:32 +02:00
Laurent Destailleur
dc96e10215
Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into
...
marcosgdf-oop-pdf
Conflicts:
htdocs/projet/class/project.class.php
2014-09-23 00:02:19 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
