Laurent Destailleur
0ba82d3c6e
Fix: Missing test on id
2014-01-20 01:27:40 +01:00
Grand Philippe
c5f29e14a4
missing trad and fix language
2013-11-02 17:50:24 +01: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
f57aaf4f4a
Fix: Do not load class like it should
2013-08-06 22:58:26 +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
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
Laurent Destailleur
f8e0f40ffa
Merge pull request #891 from marcosgdf/bug-857
...
Fix: [ bug #857 ] Invoice created from shipment does not have the order ...
2013-04-27 12:53:55 -07:00
Marcos García
ecaea4c575
Corrected incorrect lang trans key
2013-04-27 13:51:05 +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
Laurent Destailleur
4e0ef01389
Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap
2013-04-25 01:13:13 +02:00
Marcos García
82e3a8d0b9
New: [ task #823 ] Shipping_validate email notification
2013-04-21 14:14:30 +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
baad1ffc56
New: Add link to autofill/reset with quantity to ship when creating
...
a delivery receipt.
2013-04-14 12:19:21 +02:00
Laurent Destailleur
891dbf5c60
Fix: Not complete renaming
2013-04-11 21:53:41 +02:00
Laurent Destailleur
b496436fe3
Qual: Reduce number of methods. Mutualize update_note code.
2013-04-10 10:58:38 +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
dcd960a957
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: I2196e69ebae5a057eb6df018b683ff35f721ead9
2013-04-05 11:46:09 +02:00
Laurent Destailleur
677fb46136
Optimize size of graph
2013-04-04 21:13:51 +02:00
fhenry
c109467d20
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
2013-04-04 13:58:33 +02:00
Laurent Destailleur
f52fe71018
Fix: Bad div closing
2013-03-30 19:40:52 +01:00
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Laurent Destailleur
3c23a717fd
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/core/lib/files.lib.php
2013-03-30 14:10:15 +01:00
Laurent Destailleur
e0baa0fe46
Generalize fix: file with a specific mask not found, again
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/expedition/fiche.php
htdocs/fichinter/fiche.php
2013-03-30 14:04:09 +01:00
Laurent Destailleur
a5e66ab7ba
Generalize fix: file with a specific mask not found, again
2013-03-30 13:54:46 +01:00
fhenry
8971e6fe15
[ task #710 ] Envoi de mail
2013-03-23 14:39:23 +01: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
55f9879a6c
Replace table with div. Prepare work for android application.
2013-03-16 14:53:15 +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
3eb485d521
Qual: Removed TODO, deprecated code and deprecated properties. This also
...
fix missing combo box of contacts onto CC.
2013-02-12 17:08:21 +01:00
Regis Houssin
fcee35c65d
Fix: $hookmanager is a global object
2013-01-26 10:35:30 +01:00
Laurent Destailleur
56e11e52fa
New: hookmanager class is used frequently and is a factory object, so we
...
can move it during init of environment and use it globally.
2013-01-25 19:12:54 +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
Laurent Destailleur
091e469050
Fix: [ bug #622 ] attaching wrong file when sending the invoice via
...
e-mail
2013-01-07 00:40:18 +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
Regis Houssin
2d5368e135
Fix: converting line delimiters
2012-11-20 12:11:19 +01:00
Laurent Destailleur
6cdb720e9c
Fix: Missing info_admin
2012-11-20 00:13:31 +01:00