Laurent Destailleur
|
5ea3f09e17
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/translate.class.php
|
2020-09-12 04:29:28 +02:00 |
|
Laurent Destailleur
|
990af9d5cf
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
|
2020-09-12 04:25:54 +02:00 |
|
Laurent Destailleur
|
b8fe2188a6
|
Standardize code around model_pdf
|
2020-09-10 01:49:09 +02:00 |
|
Juanjo Menent
|
9bd5ed627f
|
Fix travis issues
|
2020-09-04 09:55:02 +02:00 |
|
Juanjo Menent
|
bb92e64e43
|
FIX: #14474 Error when deleting
|
2020-09-03 12:43:38 +02:00 |
|
Laurent Destailleur
|
964c4ef0d2
|
Standardize code. Use model_pdf.
|
2020-08-18 14:48:38 +02:00 |
|
Tim Otte
|
0e03578e91
|
Fixed translation of product units in documents
|
2020-08-04 11:51:40 +02:00 |
|
Laurent Destailleur
|
e455f8afa6
|
Merge pull request #14369 from Tim-Otte/fix-product-unit-translation
Fixed translation of product units in documents
|
2020-08-04 11:50:50 +02:00 |
|
Tim Otte
|
360afccecc
|
Fixed translation of product units in documents
|
2020-08-04 11:02:16 +02:00 |
|
Laurent Destailleur
|
2687666579
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-07-29 13:54:12 +02:00 |
|
Laurent Destailleur
|
8045cff888
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/expedition/class/expedition.class.php
|
2020-07-29 13:53:09 +02:00 |
|
Laurent Destailleur
|
930ae84dac
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/contact/list.php
htdocs/core/lib/pdf.lib.php
|
2020-07-29 13:50:31 +02:00 |
|
Marc DLL
|
ee55b82a8d
|
FIX: shipping creation: checks not done on weight and sizes
|
2020-07-27 23:27:44 +02:00 |
|
Frédéric FRANCE
|
e5402988d9
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-24 17:58:18 +02:00 |
|
Francis Appels
|
efa4ffa326
|
Fix ref_int deprecation.
Add to changelog and allow to use ref_ext for shipments.
|
2020-05-23 16:46:42 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
f5688b2eec
|
add new rule
|
2020-05-21 01:52:25 +02:00 |
|
Laurent Destailleur
|
ff8d22a80d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/expedition/class/expedition.class.php
scripts/cron/cron_run_jobs.php
|
2020-05-18 15:57:01 +02:00 |
|
Laurent Destailleur
|
9336828710
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/paiement/card.php
htdocs/expedition/class/expedition.class.php
|
2020-05-18 15:54:39 +02:00 |
|
Laurent Destailleur
|
45345440a4
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/expedition/class/expedition.class.php
scripts/cron/cron_run_jobs.php
|
2020-05-18 15:50:36 +02:00 |
|
Maxime Kohlhaas
|
3d9d5d0ad5
|
Fix : entity was missing in expedition fetch
|
2020-05-18 11:03:32 +02:00 |
|
Scrutinizer Auto-Fixer
|
8f0e00b4aa
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-05-02 01:39:56 +00:00 |
|
Laurent Destailleur
|
d8ba28185a
|
Merge pull request #13706 from leninrivas/develop
Cancel shipping
|
2020-04-27 14:06:39 +02:00 |
|
Scrutinizer Auto-Fixer
|
1bf5745286
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-25 11:52:07 +00:00 |
|
Laurent Destailleur
|
7bbfd2175d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/reception/class/reception.class.php
|
2020-04-24 18:58:47 +02:00 |
|
Marc Guenneugues
|
3ea8d1895b
|
Clean line extrafields when deleting expedition
|
2020-04-23 19:09:05 +02:00 |
|
Laurent Destailleur
|
72c6ac1c72
|
Complete #13708, normalization of code
|
2020-04-23 13:21:39 +02:00 |
|
stickler-ci
|
ff694c22d1
|
Fixing style errors.
|
2020-04-23 05:54:13 +00:00 |
|
Lenin Rivas
|
47654fd629
|
Shipment Canceled
Shipment canceled, not delete ref and recovery stock.
|
2020-04-23 00:49:31 -05:00 |
|
Laurent Destailleur
|
67a7d6b77d
|
Look and feel v12
|
2020-04-20 15:57:15 +02:00 |
|
Laurent Destailleur
|
fcf467989d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/class/api_shipments.class.php
|
2020-04-13 15:16:55 +02:00 |
|
Laurent Destailleur
|
236898f4e7
|
FIX #13503
|
2020-04-13 14:55:37 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Laurent Destailleur
|
79b1a2e191
|
Merge pull request #13457 from oscim/patch-30
Update expedition.class.php
|
2020-04-02 12:57:24 +02:00 |
|
stickler-ci
|
5a62da101d
|
Fixing style errors.
|
2020-03-31 09:04:46 +00:00 |
|
oscim
|
f66c90ca8b
|
Update expedition.class.php
report usage multicurrency of thirdparty in fetch method expedition for use in other process
|
2020-03-31 10:57:52 +02:00 |
|
stickler-ci
|
24c5f57da2
|
Fixing style errors.
|
2020-03-31 08:56:26 +00:00 |
|
oscim
|
5895858546
|
Update expedition.class.php
report fk_unit line in fetch_line methode
|
2020-03-31 10:54:14 +02:00 |
|
Scrutinizer Auto-Fixer
|
f413ce6aac
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-12 11:45:44 +00:00 |
|
Laurent Destailleur
|
054ffb7547
|
Depreciate variables not used by Dolibarr.
|
2020-03-06 14:38:06 +01:00 |
|
Laurent Destailleur
|
7866f89585
|
Merge pull request #13260 from atm-quentin/FIX_ecm_files
FIX ecm_files didnt match cause document ref contained "/"
|
2020-03-03 23:09:02 +01:00 |
|
atm-quentin
|
9446138951
|
FIX ecm_files didnt match cause document ref contained "/"
|
2020-03-03 12:07:18 +01:00 |
|
Laurent Destailleur
|
44eda2d4ad
|
Fix doxygen
|
2020-02-20 13:42:43 +01:00 |
|
Francis Appels
|
0e65d08455
|
Fix set create_line rang parameter not required
|
2020-02-07 10:16:56 +01:00 |
|
Laurent Destailleur
|
f45710a4b1
|
Fix phpcs
|
2019-12-23 15:51:23 +01:00 |
|
Laurent Destailleur
|
9a08a6bf6d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
|
2019-12-23 14:13:26 +01:00 |
|
Laurent Destailleur
|
eb32e98127
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-12-23 14:01:44 +01:00 |
|
Laurent Destailleur
|
36e6036e9e
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-12-23 14:01:00 +01:00 |
|
Maxime Kohlhaas
|
3e19702e39
|
Fix prevent double action on shipment close
|
2019-12-17 18:05:59 +01:00 |
|
Frédéric FRANCE
|
9e4fb8d4fe
|
doxygen
|
2019-12-15 10:02:20 +01:00 |
|
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 |
|