fmarcet
acc9879c7c
FIX: It doesn't check if there is enough stock to update the lines of orders/invoices
2016-02-01 13:05:14 +01:00
fmarcet
f615927d24
FIX Not use localtaxes when invoice some orders
2015-11-18 17:56:04 +01:00
Laurent Destailleur
bad28c6d92
Fi sntax error
2015-11-13 11:44:55 +01:00
Laurent Destailleur
eac80d7db4
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
2015-11-13 11:43:29 +01:00
Laurent Destailleur
7a0206adce
FIX Missing to set context into workflow actions, so triggers can't know
...
we are creating an invoice from order or an order from a proposal.
2015-11-08 14:37:50 +01:00
Marcos García de La Fuente
b4c3804c91
FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card
2015-11-07 13:21:03 +01:00
Laurent Destailleur
fe78996026
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/product/stock/fiche.php
htdocs/product/stock/valo.php
2015-11-05 22:04:18 +01:00
Laurent Destailleur
5777c16b72
Merge pull request #3902 from altatof/clonedorderdate
...
FIX: change order date on clone (as everywhere else)
2015-11-05 21:49:50 +01:00
Christophe Battarel
80d2445540
FIX: bad stock valorisation
2015-11-05 17:00:22 +01:00
Christophe Battarel
ad82135879
FIX: change order date on clone (as everywhere else)
2015-11-05 15:36:13 +01:00
philippe grand
e22fb3c538
fix : Typo
2015-10-02 12:39:09 +02:00
Laurent Destailleur
076f2ed9d1
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/lib/security.lib.php
2015-10-01 11:10:47 +02:00
Laurent Destailleur
4da8fb901b
Add comment
2015-10-01 10:48:09 +02:00
Regis Houssin
fbf13ec2c7
Fix: wrong logical operator
2015-09-02 14:09:19 +02:00
Laurent Destailleur
c73fe965d2
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:58:32 +02:00
Laurent Destailleur
1595765ec8
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:18:02 +02:00
Laurent Destailleur
4b51fc80a6
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
...
Conflicts:
ChangeLog
2015-08-13 00:06:27 +02:00
Marcos García de La Fuente
7cb564586e
Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything
...
Close #3310
2015-08-09 13:52:02 +02:00
Marcos García de La Fuente
4649cf7210
Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information
...
Close #3206
2015-07-18 19:40:48 +02:00
Regis Houssin
9a812a6c28
Fix: add filter for "dol_most_recent_files" for avoid conflict with
...
option "Save file on server with name "FA0700034-Original filename""
2015-06-06 13:03:02 +02:00
Gauthier
cf4308aa3b
FIX : When we automatically creta an order from a proposal with workflow module, if some extrafields of propal don't exist in order object, insertExtraFields() function tries to insert extrafields in unexistant column of commande_extrafields table.
2015-06-01 11:24:30 +02:00
Laurent Destailleur
8b596d7a69
Fix css missing
2015-05-10 23:43:18 +02:00
Laurent Destailleur
971e23e006
Fix special_code was lost when updating line
2015-05-07 12:10:27 +02:00
Marcos García de La Fuente
65f4a818d4
Merge branch '3.6' into bug-2543
2015-04-04 17:29:17 +02:00
Marcos García de La Fuente
40860a84d1
Closes #2543 : Untranslated "Contract" origin string when creating an invoice from a contract
2015-04-04 17:28:24 +02:00
Laurent Destailleur
16a620f926
Fix: Deadlock situation (when order were canceled, no way to make
...
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
2015-04-01 16:07:22 +02:00
Laurent Destailleur
293495467f
Fix: Bad ref used into notification message
2015-04-01 11:30:48 +02:00
Laurent Destailleur
5fe5ec939d
Fix: delivery date must not be autofill with current date
2015-04-01 10:54:24 +02:00
Laurent Destailleur
3cc4358e72
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/commande/liste.php
htdocs/product/stock/product.php
2015-03-29 15:24:17 +02:00
Laurent Destailleur
b60a56dc94
Fix search on command
2015-03-28 17:17:55 +01:00
Marcos García de La Fuente
e59fed9f38
Corrected search box alignment in Customer orders list
2015-03-26 11:08:34 +01:00
Fab
ea7f00e777
Fix displaying of the warning image.
...
Since last commit, $objp->date_livraison returns nothing ; max() will
then returns wrong result, and the warning image will be displayed when it
should not.
2015-03-23 20:05:31 +01:00
Marcos García de La Fuente
56295ed438
Fixed delivery date in order list not showing up
2015-03-20 11:28:23 +01:00
Juanjo Menent
4ae1106ffb
Fix: Showing system error if not enough stock of product into orders
...
creation with lines
Conflicts:
htdocs/commande/class/commande.class.php
2015-03-14 09:50:38 +01:00
Juanjo Menent
7cab558ed2
Fix: Showing system error if not enough stock of product into orders
...
creation with lines
2015-03-14 09:44:58 +01:00
Laurent Destailleur
a169b3348e
Fix show alays date fields for contract module.
...
Fix select of product were lost.
2015-03-06 14:36:22 +01:00
Laurent Destailleur
3475433eaf
Fix: the bank information were visible into pdf but were not using
...
correct setup to decide which bank to show.
2015-03-02 02:59:59 +01:00
Laurent Destailleur
8a00109baf
Fix: Several bugs int replenishment feature.
2015-03-01 16:05:20 +01:00
Laurent Destailleur
4bde7e9f51
Fix: Missing error management
2015-02-26 14:25:30 +01:00
Laurent Destailleur
fe7889e266
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:19:19 +01:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
Laurent Destailleur
4963555669
Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-misc
Conflicts:
htdocs/barcode/codeinit.php
2015-02-18 22:54:02 +01:00
Laurent Destailleur
cc1d506614
Miscelaneous debug on barcode features.
2015-02-18 21:01:17 +01:00
Marcos García de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +01:00
Laurent Destailleur
f52769b586
Merge pull request #2296 from frederic34/patch-5
...
Speed up listing with Is Order Shippable icon
2015-01-31 20:19:57 +01:00
Laurent Destailleur
0ea4a5db7d
Fixed: Error management on triggers
2015-01-31 00:08:45 +01:00
Frédéric FRANCE
355c5f0b52
Update list.php
2015-01-28 21:32:23 +01:00
Frédéric FRANCE
3403979ed7
Speed up listing with Is Order Shippable icon
2015-01-28 21:27:07 +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
Laurent Destailleur
7c5927ef93
Merge branch 'bug-1796' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1796
Conflicts:
ChangeLog
2015-01-18 15:08:49 +01:00
