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
Frédéric FRANCE
3dfb586d15
missing $conf 2019-11-28 22:50:39 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
stickler-ci
d8267fee4a Fixing style errors. 2019-11-10 11:00:19 +00:00
Philippe GRAND
a0de5bf7cb add some comment 2019-11-10 12:01:34 +01:00
Laurent Destailleur
5d41268d1e CSS 2019-11-04 19:28:04 +01:00
Laurent Destailleur
d232b7a387
Merge pull request #12286 from grandoc/new_branch_01_11_2019 
add some comment
 2019-11-02 13:00:23 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
c12e66e2a2
Merge branch 'develop' into new_branch_01_11_2019 2019-11-02 12:00:04 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Philippe Grand
99cf8f07e9
Update expedition.class.php 2019-11-01 11:25:29 +01:00
stickler-ci
4628caf0a3 Fixing style errors. 2019-11-01 09:48:58 +00:00
Philippe GRAND
d82b7f5840 add some comment 2019-11-01 10:48:21 +01:00
Laurent Destailleur
2e573fd794 Fix save of units 
Conflicts:
	htdocs/expedition/card.php
	htdocs/product/card.php
	htdocs/product/class/product.class.php
 2019-10-23 03:03:55 +02:00
Laurent Destailleur
f0355b3057 Debug option PRODUCT_ADD_NET_MEASURE 2019-10-23 02:58:39 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
7960c91955 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/theme/md/style.css.php
 2019-10-16 17:27:41 +02:00
Juanjo Menent
5a1682509b FIX It is not possible to create an expedition if there is no unit data 2019-10-16 11:11:34 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
JC Prieto
cdb6e7f9a6
Fix moved to fetch_line() 
Fix moved to fetch_line()
 2019-09-26 20:34:28 +02:00
JC Prieto
0893926189
Update expedition.class.php 
Clear lines before fech them.
 2019-09-25 12:49:19 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9 Typo abscissa 2019-09-23 21:45:23 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Laurent Destailleur
14fabeb377 Variable rangtouse -> ranktouse 2019-08-10 00:46:20 +02:00
Tim Otte
22202c2d27 Added missing parameter comment 2019-08-06 15:33:26 +02:00
Tim Otte
97223bf2eb Fixed expedition line rangs 
Rang is now transferred to the database
 2019-08-06 15:10:13 +02:00
Laurent Destailleur
11e3aa5860 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 11:07:11 +02:00
Laurent Destailleur
7931f0b422 Fix sql error 2019-07-29 11:06:39 +02:00
Laurent Destailleur
a5e3adc6f1 Fix travis 2019-07-29 10:51:17 +02:00
Laurent Destailleur
db461792a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 01:36:35 +02:00
Laurent Destailleur
9a7113f4f5 FIX Update the file index table when we validate/rename a ref. 2019-07-28 22:26:55 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
 2019-07-18 18:09:37 +02:00
Laurent Destailleur
b044d95acf Merge 2019-07-18 17:50:15 +02:00
atm-florian.m
4f03165806 FIX: outdated phpdoc 2019-07-11 12:28:24 +02:00
atm-florian.m
8030735ded Merge branch 'FIX_add_checkbox_on_shipment_delete_confirm_dialog_to_ask_if_stock_should_be_incremented' into FIX_increase_stock_on_shipment_delete_when_STOCK_CALCULATE_ON_SHIPMENT_CLOSE_is_set 
(taking PR comments into account)
 2019-07-04 15:35:22 +02:00
atm-florian.m
64d1ebf59c FIX: on shipment delete confirm dialog, a new checkbox allows the user to choose if they want their stock re-incremented after the deletion. 2019-07-04 15:06:39 +02:00
atm-florian.m
c45b191330 FIX: when STOCK_CALCULATE_ON_SHIPMENT_CLOSE is set, deleting a "closed" shipment now increases stock as expected 2019-07-01 10:26:03 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
f00c9a10db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2019-06-13 12:15:51 +02:00
Francis Appels
989cf823dd Fix scrutinizer 2019-06-12 22:55:08 +02:00
Francis Appels
a26c868783 Fix scrutinizer bugs 2019-06-12 22:05:10 +02:00
Laurent Destailleur
4c44378049 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-07 16:56:39 +02:00
Lionel VESSILLER
f9d12f9397 Fix fetch date valid in expedition object 2019-06-07 10:55:46 +02:00
florian HENRY
45270786f9 fix scrutinizer 2019-06-05 16:06:55 +02:00
Laurent Destailleur
590b1d1e90 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2019-05-08 18:24:50 +02:00
Laurent Destailleur
12409e944c Fix duplicate error message 2019-05-07 22:57:27 +02:00
Laurent Destailleur
7b01e76d2b Fix doxygen 2019-04-08 16:04:15 +02:00
Laurent Destailleur
2b87c8b663
Merge pull request #10810 from mwelters/patch-1 
NEW improve Expensereport, Inverse Receiver
 2019-04-08 14:04:08 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
markus
f942917f53 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1 2019-03-24 17:42:49 +01:00
Frédéric FRANCE
13042ade53
replace html by html5 in expedition 2019-03-10 09:13:13 +01:00
markus
1e4ed531b4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-08 11:47:08 +01:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
markus
c905575d3e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-04 17:26:40 +01:00
Laurent Destailleur
b3fb0eaf5b
Merge branch 'develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 15:48:31 +01:00
Laurent Destailleur
2448d1deaa fk_projet -> fk_project 2019-02-27 15:32:18 +01:00
Frédéric FRANCE
1c07006015
wip 2019-02-25 21:36:27 +01:00
Frédéric FRANCE
27218b7087
wip 2019-02-24 23:32:09 +01:00
markus
01b12793d2 fix typo in comment 2019-02-12 13:59:55 +01:00
Laurent Destailleur
38d4284638 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/db/pgsql.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/filefunc.inc.php
	htdocs/imports/import.php
	htdocs/supplier_proposal/card.php
 2019-02-08 11:26:08 +01:00
Laurent Destailleur
fe1188c4ea Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/filefunc.inc.php
 2019-02-08 10:44:45 +01:00
Laurent Destailleur
679a13e48c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
 2019-02-08 10:22:36 +01:00
Marc de Lima Lucio
64739098ae FIX: expedition: reset status on rollback + replace hardcoded status with const 2019-02-05 11:58:49 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
markus
bc2c6282d9 Merge branch 'develop' of https://github.com/mwelters/dolibarr into develop 2019-02-03 17:48:04 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
markus
00597477e4 Fix #10263 2019-01-26 16:06:40 +01:00
Laurent Destailleur
85cd23caaf Fix phpcs 2018-12-15 18:31:36 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00
Frédéric FRANCE
eb0b0baf40
code comment expedition class 2018-10-25 21:36:01 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
 2018-10-24 03:35:44 +02:00
Laurent Destailleur
e39e57c5b9
Update expeditionbatch.class.php 2018-10-24 02:24:47 +02:00
fappels
beb906b5f1 Deprecate class property before removing it. 2018-10-21 22:52:53 +02:00
Laurent Destailleur
97429aeb7a
Merge pull request #9721 from grandoc/new_branch_10_10_2018 
Standardize and update code
 2018-10-16 19:30:19 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
 2018-10-16 18:47:11 +02:00
Laurent Destailleur
ced4038443 FIX qty not visible for a lot when making shipment on a dedicated stock 2018-10-11 11:56:52 +02:00
Philippe GRAND
b2826966e4 Standardize and update code 2018-10-10 11:30:33 +02:00
Philippe GRAND
596dba9ce1 Standardize code 2018-10-06 12:14:47 +02:00
Philippe GRAND
74c86f477c Standardize code 2018-10-06 12:01:00 +02:00
Philippe GRAND
8bee69277d Standardize and update code 2018-10-04 09:33:30 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Frédéric FRANCE
2c3e9e92b4
Update expedition.class.php 2018-09-12 22:59:15 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Philippe GRAND
11d75573be Standardize and update code 2018-09-05 12:21:13 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Philippe GRAND
3de16a145e Standardize and update code 2018-09-02 11:08:41 +02:00
Frédéric FRANCE
3e723af018
start changing phpcs:ignore 2018-09-01 23:46:13 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Laurent Destailleur
007381907e
Merge pull request #9356 from ptibogxiv/patch-52 
Add shipping_method label in fetch
 2018-09-01 12:40:26 +02:00
ptibogxiv
49729c3118
Add shipping_method label 2018-08-30 13:54:10 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-29 18:45:36 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Frédéric FRANCE
1182f29864
trimtrailing 2018-08-28 08:33:02 +02:00
Philippe GRAND
87067b2bc9 Standardize and update code 2018-08-23 18:35:45 +02:00
Philippe GRAND
06da7f54a2 Update and standardize code 2018-08-22 18:48:53 +02:00
Philippe GRAND
e0462b975b Update and standardize code 2018-08-22 11:48:26 +02:00
Philippe GRAND
a36061079b Update and standardize code 2018-08-22 11:11:59 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
54a078149a
function declaration 2018-08-15 17:34:35 +02:00
Frédéric FRANCE
d30874750f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-14 09:02:12 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Sébastien Couragier
e58c03d7b9 #9236 Allow to import expedtion lines via API 2018-08-13 11:59:55 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Inovea Conseil
d5a3e63e05 Fix missing paramater for generateDocument 2018-06-15 09:47:28 +02:00
Laurent Destailleur
182abfdb5b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/societe/card.php
 2018-05-25 15:02:24 +02:00
Laurent Destailleur
8a64ee2297 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/list.php
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/list.php
	htdocs/societe/card.php
 2018-05-25 13:14:58 +02:00
Laurent Destailleur
1a1f0fbc62
Merge pull request #8839 from ATM-Nicolas/fix_shipping_fetch 
FIX : Fetch shipping will now fetch project id
 2018-05-25 11:46:06 +02:00
ATM-Nicolas
734ecbc9b5 FIX : Fetch shipping will now fetch project id 2018-05-23 09:47:29 +02:00
Marc de Lima Lucio
c9222adf6d FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods 2018-05-21 16:22:06 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for 
action on CRUD events.
 2018-04-10 12:03:01 +02:00
Laurent Destailleur
17d1a15d50
Update expedition.class.php 2018-03-11 00:00:24 +01:00
florian HENRY
3da645ab3b fix trigger position into explication class 2018-03-10 23:40:56 +01:00
Laurent Destailleur
a086bd0137 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/class/utils.class.php
 2018-03-06 09:20:45 +01:00
Laurent Destailleur
81e193b725
Update expedition.class.php 2018-03-05 20:46:54 +01:00
fappels
1a7c09b7d5 Fix 0 is also a valid Qty 
Fix error handling
 2018-03-04 12:35:32 +01:00
Laurent Destailleur
45418769b1
Update expeditionbatch.class.php 2018-03-02 18:11:03 +01:00
All3kcis
733ca8af7d
Use correct values of eatby and sellby on batchs expeditions 
Use new table "product_lot" to getting eatby and sellby date
 2018-03-01 14:23:19 +01:00
Laurent Destailleur
c4130730cb Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
Laurent Destailleur
8493d9f62e FIX #8163 2018-02-15 15:27:06 +01:00
Laurent Destailleur
493669e986 Fix look and feel v7 2017-12-22 14:19:12 +01:00
Laurent Destailleur
aad0da2513 Fix maxi debug of APIs (clean output fields) 2017-12-21 16:50:18 +01:00
Laurent Destailleur
95cb5025a2 Fix length of month too large 
More complete template
 2017-12-08 16:15:41 +01:00
Laurent Destailleur
e8327fd9a1 Fix the eatby/sellby date was not visible. 2017-12-02 10:43:01 +01:00
Laurent Destailleur
64d29709d5 FIX #7881 error not reported/blocking when subprodut need lot 2017-12-01 18:12:29 +01:00
Laurent Destailleur
e3671da37f Fix edit shipment line when line is a not predefined product 2017-12-01 14:33:06 +01:00
Laurent Destailleur
c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php
 2017-11-14 19:47:33 +01:00
Laurent Destailleur
b5196b7164 FIX A lot of several fix on local taxes and NPR tax 2017-11-13 14:24:40 +01:00
Laurent Destailleur
feb04b4a22
Merge branch 'develop' into 7.0_new_shipment_update 2017-11-02 15:43:31 +01:00
Laurent Destailleur
1b28c45e2c PERF Links in getNomUrl use only one tag a instead of 2. 2017-11-02 15:19:14 +01:00
Laurent Destailleur
cfacfab6cf NEW Show badge with nbr of shipment on shimpen tab of order 
NEW Add button cancel on shipment creation
 2017-11-02 12:38:36 +01:00
fappels
28604b4d82 New add delete lot 
Add empty lot row for adding new lot
When lot qty 0, lot will be deleted from line.
 2017-11-02 11:44:36 +01:00
fappels
3e58f7c609 Fix create line extra fields 2017-10-31 17:20:29 +01:00
fappels
3f5112ff48 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update 2017-10-31 16:49:54 +01:00
fappels
08f931b73c Only show show lot from same src warehouse. 
When shipping from multiple warehouse, only allow lot from same src
warehouse. (expeditiondet_batch is on to many from expeditiondet).
 2017-10-30 12:39:06 +01:00
Laurent Destailleur
202712be94 Work on module builder 2017-10-25 22:02:07 +02:00
fappels
6bf57962dc Fix travis 2017-10-24 15:48:22 +02:00
fappels
eaf3958be7 Revert "Add entrepot id to expedition batch fetchAll" 
This reverts commit 5342785a49.
 2017-10-24 15:45:49 +02:00
fappels
7f7e621ea9 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update 2017-10-24 10:53:34 +02:00
fappels
5342785a49 Add entrepot id to expedition batch fetchAll 2017-10-23 22:16:40 +02:00
fappels
6571083a78 Add line id to detail_entrepot object 
Add line id to detail_entrepot object.
Add expedition batch id to update batch in line update
 2017-10-23 22:16:00 +02:00
Laurent Destailleur
728e36f70f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/api/index.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/class/api_invoices.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/actions_sendmails.inc.php
 2017-10-22 01:43:33 +02:00
fappels
2ea687a60b Add Line triggers, Improve line error handling, ... 
Add triggers,
Improve line error handling,
use line->insert in create_line
 2017-10-18 17:01:17 +02:00
Juanjo Menent
df53870c01 FIX: Bad localtax apply 2017-10-18 12:13:32 +02:00
Juanjo Menent
4382642099 FIX: Bad localtax apply 2017-10-18 12:10:00 +02:00
fappels
907ae36cdf Add insert, update and delete methods to line class 
Cleanup properties
Add insert, line and delete methods
 2017-10-15 17:58:22 +02:00
TuxGasy
6455e6d472 Use billed field from database on fetch shipping 2017-10-12 21:19:24 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-07 11:09:31 +00:00
Laurent Destailleur
801a5180d6 Fix scrutinizer bug reports 2017-10-06 01:16:19 +02:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
TuxGasy
5b154946a8 fix missing error on stock mouvment with batch 2017-07-04 21:48:38 +02:00
TuxGasy
9f50882d6d fix incorrect indent 2017-07-04 21:45:38 +02:00
TuxGasy
c8d039508f Fix missing error message 2017-07-03 14:01:11 +02:00
Laurent Destailleur
50bf1bb21f Fix error in count of qty in other shipments 2017-06-27 16:41:57 +02:00
Laurent Destailleur
693b2fe3b4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
 2017-06-23 11:20:29 +02:00
Laurent Destailleur
45004493e0 Fix multicurrency and vat_src_code not propaged on invoice from 
shipment.
 2017-06-23 11:12:17 +02:00
atm-ph
6b4e22ec3c Fix 6910 if conf PROJECT_USE_SEARCH_TO_SELECT is used we got BadFirstParameterForGETPOST 2017-06-10 16:07:56 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
absnc
7b784a1dcb Enable shipments for project overview tab 2017-05-19 17:50:10 +11:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Marcos García de La Fuente
e0cbcadd98 In case Model for document generation is not defined, the criteria to select the model is now: 
1. Model for the object
 2. Custom default module
 3. Hardcoded default module
 2017-01-16 21:16:05 +01:00
fappels
0aacb7ce17 Filter stock on warehouse status for shipping 
Do not show stock of closed and internal warehouse.
 2016-12-05 18:14:03 +01:00
Laurent Destailleur
ecbe719f23 FIX Several problems into shipment management with lot enabled 2016-11-14 13:40:41 +01:00
Laurent Destailleur
019125f258 Uniformize code 2016-11-02 10:29:14 +01:00
Laurent Destailleur
a3607fff77 Fix customer ref of shipment 2016-10-30 16:34:46 +01:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Sergio Sanchis
81a31e8390 Fix: Need declare $user for call trigger 2016-10-18 10:52:07 +02:00
Laurent Destailleur
b412baa880 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-29 10:49:47 +02:00
fappels
3d58b0aef6 Fix livraison eatby and sellby parameters are dates 2016-09-28 00:22:29 +02:00
aspangaro
922495d72d Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
fappels
7c772b7608 Fix insert expeditiondet_batch with extrafield 
Line id of extraflied was used iso expeditiondet
 2016-09-07 14:07:29 +02:00
florian HENRY
d6be1cebcb work on going 2016-09-07 12:41:32 +02:00
Laurent Destailleur
5713d293e3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-01 03:22:16 +02:00
Alexis Algoud
02169478d0 FIX #4964 buyprice in customer from shipping 
buyprice wasn't load in expedition::fetch_lines
 2016-06-30 15:30:07 +02:00
Laurent Destailleur
b529a53501 Fix var not initialized 2016-06-28 02:36:40 +02:00
Laurent Destailleur
1368e6d462 Fix: error message was not enough to understand 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2016-06-24 21:32:38 +02:00
Laurent Destailleur
f97b67db6b Fix: error message was not enough to understand 2016-06-24 17:04:59 +02:00
Laurent Destailleur
7f4e163a52 Fix scrutinizer reports 2016-06-20 02:37:02 +02:00