Laurent Destailleur
94335b186e
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/modules/propale/mod_propale_marbre.php
2014-05-21 20:30:07 +02:00
Florian HENRY
c2370f352b
escape for insert SQL expedition module
2014-05-16 15:03:28 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
97fce71218
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/mysql/migration/repair.sql
htdocs/langs/en_US/errors.lang
htdocs/product/fiche.php
htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
Laurent Destailleur
6968304641
Fix: [ bug #1352 ] Removing a shipping does not remove the delivery.
2014-04-26 17:27:59 +02:00
Raphaël Doursenaud
20842a5c45
Qual: Missing variable declaration
2014-04-23 18:24:11 +02:00
Raphaël Doursenaud
7cdabb7d6c
Qual: Derived missing variable from a known one
2014-04-23 18:24:11 +02:00
KreizIT
fcb588f424
-Fix error when shipping a batch enabled product without stock
...
-Fix typo
2014-03-26 17:18:02 +01:00
Laurent Destailleur
ad23c88f1a
Merge pull request #1481 from atm-maxime/mko672
...
Add : Stock can be mandatory to use a product
2014-03-15 17:29:31 +01:00
Maxime Kohlhaas
1911f6fcdc
Task 672 : add stock limitation on shipment + translation
2014-03-15 14:59:27 +01:00
Maxime Kohlhaas
67342486a6
Task 1074 : add link to source document on stock movement
2014-03-15 02:18:39 +01:00
KreizIT
18e4703438
Travis fix
2014-03-07 12:21:35 +01:00
KreizIT
f0be1f7c21
Fix: Typo on class name
2014-03-07 11:51:26 +01:00
KreizIT
a0f1a60780
Change on shipment for batch product
2014-03-07 11:35:16 +01:00
Grand Philippe
a14de0c035
fix : language
2013-11-05 15:29:33 +01:00
Laurent Destailleur
1b526b7aa5
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
.travis.yml
htdocs/fourn/facture/index.php
2013-09-09 20:00:12 +02:00
Florian Henry
2740cc78b6
Add dol_syslog
...
Fix bug on expedition create : create expedition with rowid (or
origin_id) that already exits, and you will have all product of the
other expedition and the new expedition form order
Revert previous commit filter sort on fourn/facture/index.php
2013-09-05 17:45:30 +02:00
Laurent Destailleur
0f86755033
Fix: Found a dozen of bugs into sub module delivery of module shipment.
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/expedition/class/expedition.class.php
htdocs/expedition/fiche.php
2013-08-07 15:29:13 +02:00
Laurent Destailleur
d5a57f3717
Fix: Found a dozen of bugs into sub module delivery of module shipment.
2013-08-07 15:08:30 +02:00
Laurent Destailleur
e234d5342d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/contrat/liste.php
2013-07-31 12:45:39 +02:00
Florian Henry
bbaa344801
Defaulted PDF model document with default value (set in admin) for
...
Shipping and delivery
2013-07-29 12:17:24 +02:00
Laurent Destailleur
186d5ccad1
Uniformize code and look and file for shipment statistics page. This
...
remove a TODO and clean code.
2013-07-25 15:02:40 +02:00
Maxime Kohlhaas
00aded09bb
Fix : shipment prices not related to qty shipped
2013-07-19 17:27:08 +02:00
simnandez
ba6b5d27a5
New: TODO il faut incrementer le stock si on supprime une expedition
...
validee
2013-06-20 18:37:23 +02:00
Laurent Destailleur
80e470a4ce
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture.php
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/syslog/mod_syslog_file.php
htdocs/fourn/facture/impayees.php
htdocs/holiday/class/holiday.class.php
htdocs/holiday/fiche.php
2013-04-28 01:24:58 +02:00
Marcos García
1065645fb6
Fix: [ bug #857 ] Invoice created from shipment does not have the order discount
2013-04-27 13:45:25 +02:00
Maxime Kohlhaas
a9974f66b2
Fix : url was given even if value of tracking was empty + remove old use of "methode_expedition..." files
2013-04-20 11:03:36 +02:00
Maxime Kohlhaas
bfb05c78cd
Change carrier config into dict instead of dedicated conf page
2013-04-19 20:20:10 +02:00
Laurent Destailleur
891dbf5c60
Fix: Not complete renaming
2013-04-11 21:53:41 +02:00
Laurent Destailleur
2ab5c2029d
Merge pull request #817 from grandoc/develop
...
add supplier invoice extrafields and some fixes
2013-04-09 12:21:26 -07:00
fhenry
275bf67bb7
[ task #811 ] Uniformanize note field
2013-04-09 17:18:07 +02:00
Grand Philippe
c6106e1a8c
fix: Champ e.fk_expedition_methode inconnu dans field list
2013-04-09 12:03:49 +02:00
fhenry
c109467d20
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
2013-04-04 13:58:33 +02:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
eldy
1d09e122c0
Some debug with pgsql
2013-03-17 14:28:57 +01:00
Laurent Destailleur
4dbf5a20ad
Merge pull request #687 from frederic34/develop
...
WIP : Admin for Carriers
2013-02-23 07:38:55 -08:00
frederic34
9333fdb97f
WIP : Admin for Carriers
2013-02-23 15:23:33 +01:00
Laurent Destailleur
37b94e43c8
Merge pull request #685 from frederic34/develop
...
WIP : Admin for Carriers
2013-02-23 03:11:52 -08:00
frederic34
c8872d7e98
WIP : Admin for carriers
2013-02-23 10:20:31 +01:00
jfefe
7e79e1a574
Fix bug #735 : Error when trying send expedition card
2013-02-22 16:02:19 +01:00
frederic34
67c06225a5
WIP : Admin for carriers
2013-02-22 14:18:51 +01:00
frederic34
d26024d8fc
WIP : Admin for Carriers (Activate/Desactivate)
2013-02-21 23:40:25 +01:00
Laurent Destailleur
8af34ee97e
Fix: Bad property
2013-02-17 18:40:09 +01:00
Grand Philippe
ab2b06117b
fix trad : change adresse versus address
2013-02-15 19:56:51 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
simnandez
c70bba3a57
Fix: showrefnav fails with multicompany
2012-12-18 09:01:04 +01:00
Laurent Destailleur
46976bd009
Fix: Some fix in volume calculation
2012-11-18 16:21:38 +01:00
Laurent Destailleur
7e1a74cef1
Fix: If shipment is closed before delivery element is generated, there
...
was no way to generate it again (dead lock situation).
2012-11-03 21:14:23 +01:00
Laurent Destailleur
078b015db8
Work on multitax (vat). Need your test.
...
Qual: Because params were often missing in calculate_price(), params are
now mandatory.
2012-11-03 16:32:49 +01:00
