lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

622 Commits

Author SHA1 Message Date
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
Regis Houssin
0e0bbbeddc Fix: morning strict mode 2012-10-31 09:50:20 +01:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
f322ec50ed New: [ task #498 ] - final part 2012-08-25 15:21:34 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Laurent Destailleur
068c536741 Fix: Delete all files (PROV* when validating. 2012-08-07 14:24:54 +02:00
Regis Houssin
89cd23452f Fix: missing delete shipping and delivery files 
(minimum for possibility to merge with 3.2)
 2012-08-05 20:41:11 +02:00
Marcos García
5a73c32f46 Migrated ClassName to __construct() function 
Changed $DB to $db
lower-cased "Class"
 2012-07-30 17:17:33 +02:00
Laurent Destailleur
d6a5b224fb Revert bad practice: setEvent use SESSION. Such usage is limited to HTML 
page context and can be used inside any pages.
However usage of _SESSION must never be used inside a library (except
for function dedicated to HTML page context), and never inside
object classes (we must use $this->errors, $this->mesgs or
$this->warnings instead).
 2012-07-29 14:15:29 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Grand Philippe
04f2b04dcf try to fix : shipping specimen model not displayed 2012-04-22 00:41:13 +02:00
Regis Houssin
ffc6812241 Fix: avoid php strict mode warning 2012-03-23 18:19:50 +01:00
Laurent Destailleur
84397b4735 New: Add same contact tab than for object origin. This is to avoid to 
switch to view/edit.
 2012-03-14 14:00:20 +01:00
simnandez
7e02e3faf6 New: [ task #156 ] Create an invoice from a delivery receipt 2012-03-13 17:28:55 +01:00
simnandez
6c9433c384 New: [ task #156 ] Create an invoice from a delivery receipt. Firsts 
works
 2012-03-08 22:30:45 +01:00
Laurent Destailleur
b8a61e73a0 New: Add product_label into substitution tags for ODT. 2012-02-20 23:58:36 +01:00
Regis Houssin
cd3452d71d Fix: multicompany sharings and uniformize code 2012-02-11 10:18:09 +01:00
Regis Houssin
6a43a517f1 Fix: add deleteObjectLinked function 2012-02-07 16:47:46 +01:00
Laurent Destailleur
2d67802938 Doxygen 2012-01-08 00:52:07 +01:00
Laurent Destailleur
4523f1789d Qual: Removed dead code 
Doxygen
 2012-01-04 23:56:10 +01:00
Regis Houssin
5f02432d90 Fix: add possibility to force date of stock movement 2011-12-18 20:59:05 +01:00
Regis Houssin
4fd0a12731 Fix: double increment !!! 2011-12-16 18:55:09 +01:00
Juanjo Menent
e4ee9680d7 Qual: Uniformize code 2011-12-16 15:29:58 +01:00
Laurent Destailleur
b52fc32853 Fix: fix not initialized variables 2011-12-05 19:41:38 +01:00
Laurent Destailleur
3d0c324f5f Fix: Message for stock movement was wrong or missing 2011-11-08 00:03:19 +01:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
eldy
0a9364c5e9 Doxygen 2011-09-29 22:32:28 +02:00
Laurent Destailleur
be6286c4b8 Qual: More POO. 
Qual: Doxygen
 2011-09-20 17:19:46 +00:00
Regis Houssin
551e1f81bf Fix: Space after closing parenthesis of function call prohibited 2011-09-20 13:32:16 +00:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Laurent Destailleur
1aaf65c257 PDF works with us letter format 2011-08-31 14:42:47 +00:00
Regis Houssin
2ecc03104c Fix: remove obsolete tags (in progress) 2011-08-27 15:14:31 +00:00
Laurent Destailleur
be771c9d44 Fix: Avoid errors into rpm packages 2011-07-31 23:45:11 +00:00
Laurent Destailleur
df8da8678b Fix: pgql compatibility 2011-07-04 10:30:00 +00:00
Regis Houssin
5cbd809f73 Fix: uniformize code 2011-06-19 19:47:09 +00:00
Regis Houssin
a9bd88ccf7 Fix: missing statut after validation 2011-06-17 13:39:38 +00:00
Regis Houssin
e540dd5aef Fix: uniformize code 
Fix: variable conflict
 2011-06-15 19:53:37 +00:00
Regis Houssin
3dbcb5c933 Fix: uniformize code 2011-06-14 18:19:09 +00:00
Regis Houssin
857006c456 Works on possibility to send shipping by mail 
Fix: uniformize code
 2011-06-02 17:20:24 +00:00
Regis Houssin
e2efc8abcc Fix: bad value with constraint 
Fix: hide link if no tracking number
 2011-05-31 06:17:19 +00:00
Regis Houssin
ab4d25b243 Fix: bad value with constraint 
Fix: hide link if no tracking number
 2011-05-31 06:16:05 +00:00
Regis Houssin
3bd34b76ed Fix: some bugs and translations 2011-05-30 18:49:31 +00:00
Philippe Grand
1d2748106a uniformize code 2011-05-29 13:15:37 +00:00
Regis Houssin
2b5f7aac4e Fix: uniformize code 2011-05-26 15:33:33 +00:00
Regis Houssin
38a097b2fb New: add shipment method "Lettre Max" for France 2011-05-25 16:53:39 +00:00
Laurent Destailleur
edd91b7d26 Qual: Clean stock increase/decrease code 2011-05-23 23:46:39 +00:00
Laurent Destailleur
e9f4879245 Qual: Prepare move of function dol_delete_file into file.lib.php 2011-03-09 15:34:57 +00:00
Regis Houssin
3b4ea76538 Fix: compatibility with pgsql, replace all addslashes by $this->db->escape in class 2011-02-24 18:11:12 +00:00
Laurent Destailleur
8fd2f8a577 Define a default module is not defined 2011-02-20 22:53:59 +00:00
Juanjo Menent
08114f30d9 Task #10577: Works with shipments 2011-02-20 00:20:45 +00:00
Regis Houssin
502bb75d2c Fix: uniformize code 2010-12-15 07:12:28 +00:00
Laurent Destailleur
2498426867 Fix: Restore stable version for 3.0 2010-12-14 23:27:17 +00:00
Regis Houssin
9d46536909 Fix: uniformize code 2010-12-14 15:04:56 +00:00
Laurent Destailleur
4ad3754d59 Enhance phpunit tests 2010-12-13 11:27:41 +00:00
Regis Houssin
93df5fcb01 Works on hook integration 2010-09-21 09:44:15 +00:00
Laurent Destailleur
0c72d41f36 New: Use a function to format address according to country 2010-09-19 16:25:24 +00:00
Regis Houssin
156a1e6b29 Qual: uniformize code 2010-09-10 14:35:07 +00:00
Regis Houssin
9664f0af5f Qual: big uniformize code 2010-09-09 14:06:15 +00:00
Regis Houssin
f4e656eee1 Fix: regression 2010-09-06 22:31:36 +00:00
Laurent Destailleur
46546a78ab Fix: Restore all behaviour of order management of line. The new one is too complex and could not work as it is done. 2010-09-06 21:10:45 +00:00
Laurent Destailleur
f91b786de6 Fix: Correct a no more working request 2010-09-06 20:55:32 +00:00
Regis Houssin
63908863cc Works on migration management positioning lines 
Phase 4 : llx_expeditiondet et llx_livraisondet
 2010-09-06 16:39:38 +00:00
Regis Houssin
b9ba88a5d2 Works on migration management positioning lines 
Phase 4 : llx_expeditiondet et llx_livraisondet
 2010-09-06 16:31:28 +00:00
Laurent Destailleur
153d2080f0 Qual: Uniformize dictionnary table names. 2010-09-06 00:02:55 +00:00
Philippe Grand
fb06c15330 task #6689, strlen problem 
replace  strlen with dol_strlen
 2010-08-24 14:42:18 +00:00
Laurent Destailleur
98a4430d5f Better postgresql compatibility 2010-08-14 02:44:07 +00:00
Laurent Destailleur
5affcd3b3f Qual: Renamed french field "envente" into "tosell". 2010-08-11 18:35:31 +00:00
Laurent Destailleur
c0fd415527 Fix: Column name was not changed everywhere 2010-07-29 12:37:09 +00:00
Laurent Destailleur
6c887071a6 Doxygen 2010-07-21 12:16:25 +00:00
Laurent Destailleur
9dfb79ebc8 Fix: A lot of fix in stock value calculation. 2010-07-14 15:41:41 +00:00
Laurent Destailleur
a4f95ead07 Fix on shipping module 2010-06-17 20:24:11 +00:00
Laurent Destailleur
6b2fb32bf5 Add previous/next on shippings 2010-06-06 15:53:49 +00:00
Laurent Destailleur
10f86aa217 Reorganize class files. 2010-06-05 15:32:18 +00:00
Philippe Grand
e8db8b2755 Some spelling changes 2010-06-05 13:27:11 +00:00
Laurent Destailleur
7d79116734 Fix: Restore broken features in shipping module 2010-05-26 22:06:27 +00:00
Laurent Destailleur
d06e26a043 Fix: Can edit shipping 2010-05-23 01:24:54 +00:00
Laurent Destailleur
6ef1098734 Rename DELIVERY_VALIDATE into SHIPPING_VALIDATE to make a difference between sending (SHIPPING) and receiving module (DELIVERY). 2010-05-18 07:22:58 +00:00
fcharpentier
bb5d3bc421 Update trigger on shipping validation to rename action 'DELIVERY_VALIDATE' 2010-05-17 16:24:19 +00:00
Laurent Destailleur
3082e61164 Fix: A lot of fix in shipping module 2010-05-17 14:13:03 +00:00
Laurent Destailleur
757f9491e1 Fix: A lot of fixes on delivery date 2010-05-12 23:03:33 +00:00
Laurent Destailleur
89c76d13b2 Fix: Remove depracated property 
Qual: Removed pdate
 2010-05-08 19:21:57 +00:00
Philippe Grand
391c595dda according to new tree directory 2010-04-29 08:50:46 +00:00
Regis Houssin
e4ea54f315 Fix: move class to class directory 
Fix: mutualize code
 2010-04-28 17:30:59 +00:00
Philippe Grand
907bd0a67e according to new tree directory 2010-04-28 13:52:55 +00:00
Philippe Grand
be059c05f0 according to new tree directory 2010-04-28 12:13:27 +00:00