Commit Graph

89109 Commits

Author SHA1 Message Date
stickler-ci
c176044379 Fixing style errors. 2019-10-22 14:26:26 +00:00
Philippe GRAND
4dd5c00ec0 Internationalization 2019-10-22 16:25:10 +02:00
gauthier
44ced0cbeb FIX : if we search something with global search, and after with form fields, we want to stay on Products AND Services list 2019-10-22 16:11:59 +02:00
dolibarr95
d0a599a1d8
Reduce the $companystatic calls 2019-10-22 15:51:30 +02:00
Laurent Destailleur
22a14e7bf7 Fix closig tag 2019-10-22 15:40:29 +02:00
Laurent Destailleur
6079a4d159 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/langs/en_US/main.lang
2019-10-22 15:25:31 +02:00
Laurent Destailleur
84c8b6b5d1 FIX #12198 2019-10-22 15:23:23 +02:00
Laurent Destailleur
f9c86256dc FIX #12198 2019-10-22 15:21:41 +02:00
Laurent Destailleur
8242281ef8 Close #12096 2019-10-22 14:39:33 +02:00
Laurent Destailleur
24174a0eea
Merge pull request #12201 from c3do/develop
Fix getListOfShipmentMethods
2019-10-22 14:05:22 +02:00
dolibarr95
af8f5948f0
Package tables
llx_expedition_package and llx_c_shipment_package_type
2019-10-22 13:54:50 +02:00
Laurent Destailleur
5a50dce82e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-22 13:52:29 +02:00
Laurent Destailleur
f0844222ed Work on MRP 2019-10-22 13:52:18 +02:00
Laurent Destailleur
5ad7ca5620 Code more generic around setting projet on a card 2019-10-22 13:43:24 +02:00
ptibogxiv
c3fac0b8c9
Update llx_adherent_type.sql 2019-10-22 12:52:41 +02:00
ptibogxiv
d77215c40e
Update llx_adherent_type.sql 2019-10-22 12:52:14 +02:00
Cédric
d098efb8fe
getListOfShipmentMethods: Add rowid field in sql select 2019-10-22 12:52:08 +02:00
Cédric
07bb968a9c
Merge pull request #1 from Dolibarr/develop
sync 20191022
2019-10-22 12:47:25 +02:00
Laurent Destailleur
8aacfcdfbd
Merge branch 'develop' into patch-234 2019-10-22 12:46:39 +02:00
Laurent Destailleur
a4eab82894
Merge pull request #12191 from andreubisquerra/master
NEW Multiple payments in a TakePOS sale
2019-10-22 12:45:19 +02:00
Laurent Destailleur
6638b361d4
Update invoice.php 2019-10-22 12:44:19 +02:00
Laurent Destailleur
b2bbee55f1 Fix phpcs 2019-10-22 12:37:36 +02:00
Laurent Destailleur
2eb5803644
Merge pull request #12196 from bb2a/patch-2
Update functions.lib.php
2019-10-22 12:36:47 +02:00
Laurent Destailleur
1ba9c31b37 Add migration of index 2019-10-22 12:34:03 +02:00
Laurent Destailleur
fc0d7d2694
Merge pull request #12197 from openthink-laurent/add-index-fk-origin-line-column-llx-expeditiondet-table
Add index on fk_origin_line column of llx_expeditiondet table
2019-10-22 12:33:17 +02:00
Laurent Destailleur
9be9f912af
Merge pull request #12192 from Ahuahuachi/develop
Translate documentation and minor code improvement
2019-10-22 12:32:40 +02:00
Laurent Destailleur
e5ee83ead1
Merge pull request #12194 from grandoc/new_branch_21_10_2019
internationalization
2019-10-22 12:31:48 +02:00
Tim Otte
ad51e862e4 Merged 2019-10-22 11:39:32 +02:00
Tim Otte
ceb3482204 Requested changes implemented 2019-10-22 11:36:28 +02:00
Laurent Léonard
b5aab50194 Add index on fk_origin_line column of llx_expeditiondet table 2019-10-22 06:07:11 +02:00
Laurent Destailleur
aa4afcfe8a NEW Can set a filter on object linked in modulebuilder. 2019-10-22 03:49:09 +02:00
Laurent Destailleur
c5490e22d1 Fiw trans 2019-10-22 02:58:55 +02:00
Laurent Destailleur
6aa2ceac1a Fix phpcs 2019-10-22 02:53:29 +02:00
Laurent Destailleur
2fb521667c Doc 2019-10-22 02:42:08 +02:00
Laurent Destailleur
1c6df393a7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/supplier/index.php
2019-10-22 02:41:10 +02:00
Laurent Destailleur
6205913056 FIX CVE-2019-17578 CVE-2019-17577 CVE-2019-17576 2019-10-22 02:35:54 +02:00
Anthony Berton
5e7d615250
Update functions.lib.php 2019-10-21 21:06:48 +02:00
Laurent Destailleur
8e474701c1 Fix missing token 2019-10-21 15:49:08 +02:00
Laurent Destailleur
4ba665b8b7 Fix up down of lines into a BOM 2019-10-21 15:02:06 +02:00
Laurent Destailleur
e261d63295 NEW Can add a button "Create" after combo of object with modulebuilder. 2019-10-21 14:44:39 +02:00
Laurent Destailleur
48f5970c7a Debug net measure 2019-10-21 14:43:39 +02:00
Laurent Destailleur
38aa648363 Autofill the MO with data from BOM 2019-10-21 11:38:35 +02:00
Laurent Destailleur
be3f0471ff Fix phpcs 2019-10-21 11:27:48 +02:00
Laurent Destailleur
3024919cd6 fix phpcs 2019-10-21 10:25:23 +02:00
Philippe GRAND
a0303e903a internationalization 2019-10-21 09:53:42 +02:00
Philippe GRAND
db22cdb8ea internationalization 2019-10-21 09:43:34 +02:00
dolibarr95
c235740544
parcel to package 2019-10-21 08:58:13 +02:00
dolibarr95
16bd837dc7
create file
Dictionary of package type
2019-10-21 08:54:59 +02:00
dolibarr95
6a55aedf59
Create file.
List of parcels details related to an expedition.
2019-10-21 08:46:07 +02:00
Laurent Destailleur
febf9ccd04 FIX The Button "Automatic binding" did not use the account intracomm or
export.
2019-10-21 05:24:54 +02:00