lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
80,125 Commits 43 Branches 150 Tags 886 MiB
8a22dcdbcb
Commit Graph

70317 Commits

Author SHA1 Message Date
Laurent Destailleur
0180014d4d Fix link in popup of shipment 2019-10-23 01:35:32 +02:00
Laurent Destailleur
d25af2d199 Show dimensions of product on the tooltip on product reference 2019-10-23 01:29:07 +02:00
Laurent Destailleur
887a5a43d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-22 20:25:30 +02:00
Laurent Destailleur
fea12076ee FIX #12152 2019-10-22 20:24:52 +02:00
Laurent Destailleur
2f0b791cfe
Merge pull request #12202 from atm-gauthier/10.0_fix_search_on_product_and_service 
FIX : if we search something with global search, and after with form …
 2019-10-22 20:06:10 +02:00
Laurent Destailleur
1cd1152290
Merge pull request #12193 from dolibarr95/patch-56 
NEW: package sql data
 2019-10-22 19:25:32 +02:00
Laurent Destailleur
5d9e7215ae
Merge pull request #12203 from grandoc/new_branch_22_10_2019 
Internationalization
 2019-10-22 19:24:23 +02:00
Laurent Destailleur
c4be61c55c FIX Better compatible fix for the trouble of weight / size units 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/card.php
 2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d FIX Better compatible fix for the trouble of weight / size units 2019-10-22 18:36:36 +02:00
stickler-ci
5ab6228adb Fixing style errors. 2019-10-22 15:12:42 +00:00
Philippe GRAND
ce255b6f36 Merge remote-tracking branch 'origin/new_branch_22_10_2019' into new_branch_22_10_2019 2019-10-22 17:12:06 +02:00
Philippe GRAND
9b2905fb43 Typo and comment 2019-10-22 17:10:52 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
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
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
Cédric
d098efb8fe
getListOfShipmentMethods: Add rowid field in sql select 2019-10-22 12:52:08 +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
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
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
Laurent Destailleur
776bfabfc4 FIX If country not defined keep value empty 2019-10-21 05:24:42 +02:00
Laurent Destailleur
6ebd9721da FIX The Button "Automatic binding" did not use the account intracomm or 
export.
 2019-10-21 03:50:57 +02:00
Laurent Destailleur
9b1385ee86 FIX If country not defined keep value empty 2019-10-21 03:37:44 +02:00
Alfredo Altamirano
0c5fbdf29d Translate french documentation 2019-10-20 19:18:39 -05:00
Laurent Destailleur
a2b8aa55ad Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-21 00:56:04 +02:00
Laurent Destailleur
b21bca17de Add button Save and stay when editing property of web site 2019-10-21 00:55:52 +02:00
andreubisquerra
df181d1f35 Multiple payments in a TakePOS sale 2019-10-20 22:01:54 +02:00
Laurent Destailleur
6e9f3c3f9d
Merge pull request #11084 from atm-florian/dev_MassSendEmailInvoiceToBillingContact 
NEW : mass email action on invoice list use billing contact if exists
 2019-10-20 21:45:37 +02:00
Laurent Destailleur
528ded58cf
Merge pull request #12187 from c3do/develop 
NEW Add API to get Country by code and iso
 2019-10-20 21:26:44 +02:00
Alfredo Altamirano
f2e5a23547 Declaration of $soc should not be conditional 2019-10-20 13:47:39 -05:00
Alfredo Altamirano
d921b08e5c Translate documentation of translate class 2019-10-20 11:44:07 -05:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Frédéric FRANCE
0ede817588
do not ignore lines with mix od tabs and spaces 2019-10-20 16:56:47 +02:00
c3do
bc6fb54798 New Add API to get List of Shipment methods 2019-10-20 15:56:27 +02:00
Laurent Destailleur
05352a62e5 css 2019-10-20 15:37:20 +02:00
Laurent Destailleur
5a4960f7ae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/takepos/takepos.php
 2019-10-20 15:30:28 +02:00
Laurent Destailleur
45d64e468f Fix regression 2019-10-20 15:29:15 +02:00
Laurent Destailleur
e224170dc2 FIX Clean the + of categories on the product view only in POS module 
Conflicts:
	htdocs/takepos/takepos.php
 2019-10-20 15:27:09 +02:00
c3do
4fb0d03500 NEW Add API to get Country by code and iso 2019-10-20 15:25:18 +02:00
Laurent Destailleur
f999430fd3 FIX Clean the + of categories on the product view only in POS module 2019-10-20 15:24:52 +02:00
Laurent Destailleur
49c101bb77 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-20 15:16:51 +02:00
Laurent Destailleur
d79114c1f8 Clean code 2019-10-20 15:16:40 +02:00
Laurent Destailleur
b813dfe3c9
Merge pull request #12172 from TobiasSekan/FixMissingIcalAuthor 
Fix missing organizer and contact on ical export
 2019-10-20 13:49:47 +02:00
Laurent Destailleur
89b0730483
Update actioncomm.class.php 2019-10-20 13:49:36 +02:00
Laurent Destailleur
1b3d6d749a
Merge pull request #12175 from Shnoulle/develop 
Close #12098 : allow usage of AUTH LOGIN in smtp
 2019-10-20 13:48:24 +02:00
Laurent Destailleur
e95861c361
Update smtps.class.php 2019-10-20 13:48:01 +02:00
Laurent Destailleur
3b5e62947d
Update smtps.class.php 2019-10-20 13:44:28 +02:00
Laurent Destailleur
05fed5358a
Merge pull request #12179 from c3do/develop 
NEW Add API to get objects by ref, ref_ext, ...
 2019-10-20 13:42:18 +02:00
Laurent Destailleur
54b7886331
Update api_orders.class.php 2019-10-20 13:40:18 +02:00
Laurent Destailleur
060535189b
Merge pull request #12185 from frederic34/patch-1 
add empty line on mrp bom index.php
 2019-10-20 13:32:33 +02:00
Laurent Destailleur
1f1945fc5c
Update index.php 2019-10-20 13:32:27 +02:00
Laurent Destailleur
84f6fd64a9
Merge pull request #12176 from Ahuahuachi/develop 
Translation of some function documentation
 2019-10-20 13:31:25 +02:00
Laurent Destailleur
9e7476cd1f
Merge pull request #12171 from grandoc/new_branch_18_10_2019 
Standardization
 2019-10-20 13:30:40 +02:00
Laurent Destailleur
5bcc4613a3
Merge pull request #12168 from frederic34/patch-15 
Update card.php
 2019-10-20 13:30:18 +02:00
Laurent Destailleur
1faea24eeb
Merge pull request #12183 from frederic34/longlines 
cut long lines
 2019-10-20 13:29:01 +02:00
Laurent Destailleur
24dc7fb667
Merge pull request #12173 from OPEN-DSI/new-product-clone-customer-prices 
NEW add clone customers prices in clone product or service
 2019-10-20 13:27:50 +02:00
Laurent Destailleur
e550acc688 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-20 13:22:38 +02:00
Laurent Destailleur
bf1b2242ea Fix no focus if we are on edit mode directly 2019-10-20 13:22:29 +02:00
Laurent Destailleur
40135e043e
Merge pull request #12166 from frederic34/patch-13 
fix cant add bookmark with csrf active
 2019-10-20 12:43:39 +02:00
Laurent Destailleur
4906500f03
Merge pull request #12169 from frederic34/patch-16 
Update don.class.php
 2019-10-20 12:43:21 +02:00
Laurent Destailleur
9a4705aa4d
Merge pull request #12165 from frederic34/topnew 
clean top menu xxx
 2019-10-20 12:42:14 +02:00
Laurent Destailleur
b5390bfb3c
Merge pull request #12167 from frederic34/patch-14 
Update main.lang
 2019-10-20 12:41:06 +02:00
Laurent Destailleur
62a8523ccf
Merge pull request #12178 from frederic34/patch-18 
Update functions2.lib.php
 2019-10-20 12:40:34 +02:00
Laurent Destailleur
ff30274a59
Merge pull request #12177 from frederic34/patch-17 
Update box_produits.php
 2019-10-20 12:40:10 +02:00
Frédéric FRANCE
7581275316
wip 2019-10-20 11:59:21 +02:00