Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
38,401 Commits 36 Branches 189 Tags
3cf3dbeb51cc8f37ef29fb8fea31f4aafb1c0424
Commit Graph

120 Commits

Author SHA1 Message Date
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