Commit Graph

72858 Commits

Author SHA1 Message Date
Laurent Destailleur
d79778a67e Fix reponsive 2018-08-08 17:00:16 +02:00
Laurent Destailleur
de1386c83c Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0 2018-08-08 16:49:09 +02:00
Philippe GRAND
5b8b4a1415 Standardize 2018-08-08 12:29:36 +02:00
pa-de-solminihac
fc5481fb1d FIX massaction builddoc: include PDF files created from an ODT template too 2018-08-08 12:04:10 +02:00
Juanjo Menent
948bb47040
Merge pull request #9207 from atm-florian/dev_showadressinthirdpartylistoption
NEW: Add option to display thirdparty adress in combolist
2018-08-08 11:14:22 +02:00
Juanjo Menent
ca7666793b
Merge pull request #9213 from fmarcet/develop
New: Sales representative column on Propal List
2018-08-08 11:11:20 +02:00
Juanjo Menent
e2499392a9
Merge pull request #9215 from fmarcet/7.0
Fix: Bad position when document have incoterms/notes
2018-08-08 11:10:47 +02:00
Juanjo Menent
b840152bcd
Merge pull request #9217 from ATM-Nicolas/fix_undefined_index_notnull
FIX : PHP warning, undefined index notnull
2018-08-08 11:10:17 +02:00
Juanjo Menent
1dbec93144
Merge pull request #9216 from atm-gauthier/NEW_tag_fourn
NEW : tag odt line_product_ref_fourn for supplier doc lines
2018-08-08 11:09:01 +02:00
Juanjo Menent
229a5d3532
Merge pull request #9203 from grandoc/new_branch_04_08_2018
comment translation
2018-08-08 11:07:18 +02:00
Juanjo Menent
edc67f62a9
Merge pull request #9200 from hregis/develop_accounting
FIX better compatibility with Multicompany
2018-08-08 11:05:12 +02:00
Juanjo Menent
af50d36560
Merge pull request #9197 from ATM-Nicolas/new_withdrawrequest_massaction
NEW : Withdraw request massaction can include already on process invoices
2018-08-08 10:58:53 +02:00
Juanjo Menent
9f09c97eb9
Merge pull request #9198 from OPEN-DSI/fix_cmd_list
FIX : Search on Ref project on order list
2018-08-08 10:56:57 +02:00
ptibogxiv
ba943bcbaa
fix spaces 2018-08-08 10:13:28 +02:00
ptibogxiv
78edd035f8
add statement descriptor as newpayment.php 2018-08-08 10:12:25 +02:00
Frédéric FRANCE
5f4d54ede5
correct space 2018-08-07 17:17:58 +02:00
Frédéric FRANCE
69321c47be
correct space 2018-08-07 17:11:41 +02:00
Frédéric FRANCE
cb53366955
Merge remote-tracking branch 'upstream/develop' into variant 2018-08-07 16:55:50 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-07 16:40:03 +02:00
gauthier
a2a8929d0e NEW : tag odt line_product_ref_fourn for supplier doc lines 2018-08-07 11:45:56 +02:00
Ferran Marcet
5ce31f65a4 Fix: Bad position when document have incoterms/notes 2018-08-07 11:40:11 +02:00
Philippe GRAND
68de0ba93b clean and update code 2018-08-07 10:56:59 +02:00
Philippe GRAND
42fe2b78de clean and update code 2018-08-07 10:44:26 +02:00
atm-greg
294045daed update description without multicurrency 2018-08-07 10:16:04 +02:00
Ferran Marcet
c74ffade7d New: Sales representative column on Propal List 2018-08-07 10:05:50 +02:00
atm-greg
be63f0dc89 add migration for desc_fourn 2018-08-07 09:49:57 +02:00
ATM-Nicolas
5b15e688af FIX : PHP warning, undefined index notnull 2018-08-07 09:38:18 +02:00
atm-greg
ad5f59822e Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description 2018-08-07 09:33:30 +02:00
atm-greg
fc705e8510 Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description 2018-08-07 09:31:41 +02:00
atm-greg
c1de7fe8ac fix update_buyprice 2018-08-07 09:15:30 +02:00
ptibogxiv
e84018ac15
Fix 3D secure
convett to dolibarr standard stripe payment metadata
2018-08-06 19:21:12 +02:00
atm-greg
08273612d9 create field without migration 2018-08-06 17:21:20 +02:00
atm-greg
7063850034 add sql field 2018-08-06 16:32:25 +02:00
atm-greg
a8b33a1710 New fields desc_supplier on product_fourn_prices 2018-08-06 16:26:25 +02:00
ptibogxiv
e926efe022
fix connect mode for v8 release 2018-08-06 12:39:50 +02:00
ptibogxiv
f6e5b71f21
Fix and compatibility for V8 and connect
fix for V8 release and optimal functionnality with connect mode
2018-08-06 12:29:38 +02:00
Philippe GRAND
094fc6b699 Standardize 2018-08-06 11:53:33 +02:00
florian HENRY
74d05da149 fix : display if error 2018-08-06 11:28:34 +02:00
florian HENRY
847d5bfb92 add config 2018-08-06 10:55:28 +02:00
florian HENRY
45a52a955e NEW: Add optoin to display thirdparty adress in combolist 2018-08-06 10:52:10 +02:00
Philippe GRAND
4e3898d357 standardize 2018-08-05 17:21:59 +02:00
Philippe GRAND
de5281e587 standerdize 2018-08-05 10:56:39 +02:00
Philippe GRAND
59cd0a5e5e uniformize 2018-08-04 15:58:05 +02:00
ptibogxiv
3c15da9dde
Fix payment in connect mode
I know that it's not an optimal fix but it's functionnal for dolibarr 8.0.0 release
2018-08-04 14:30:52 +02:00
Philippe GRAND
948647f3f9 comment translation 2018-08-04 14:17:51 +02:00
florian HENRY
0d85eb52c5 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-08-03 17:10:26 +02:00
florian HENRY
615ed11534 fix bad use of test_sql_and_script_inject return int not value tested 2018-08-03 17:09:58 +02:00
atm-quentin
09dfcc6016 FIX exclude element of the select 2018-08-03 14:54:21 +02:00
Regis Houssin
b1a340b193 FIX "account_parent" is linked with "account_number" instead rowid 2018-08-03 14:01:00 +02:00
Regis Houssin
fa32e48b8a FIX change column "account_parent" and missing modify column 2018-08-03 13:53:12 +02:00