atm-greg
|
be63f0dc89
|
add migration for desc_fourn
|
2018-08-07 09:49:57 +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 |
|
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 |
|
Laurent Destailleur
|
e8f8508401
|
Merge pull request #9165 from atm-quentin/FIX_project_overview
FIX project overview (can use any fields as fk_projet)
|
2018-08-02 18:46:37 +02:00 |
|
Laurent Destailleur
|
b01f07efda
|
Merge branch 'develop' into FIX_project_overview
|
2018-08-02 18:43:55 +02:00 |
|
Laurent Destailleur
|
e106fda5e6
|
Merge pull request #9113 from torvista/export-import
Fix for Warning: A non-numeric value encountered in bank.lib.php on line 359
|
2018-08-02 18:38:46 +02:00 |
|
Laurent Destailleur
|
0e3473701a
|
Update bank.lib.php
|
2018-08-02 18:38:33 +02:00 |
|
Laurent Destailleur
|
6010d9de4b
|
Merge pull request #9158 from atm-gauthier/7.0_missing_hook
FIX : missing hook to edit sql
|
2018-08-02 18:36:25 +02:00 |
|
Laurent Destailleur
|
fbc742c2c3
|
Merge pull request #9157 from frederic34/patch-21
Update website.php
|
2018-08-02 18:34:22 +02:00 |
|
Laurent Destailleur
|
bf71b4a664
|
Merge pull request #9154 from frederic34/patch-18
Update websiteaccount_card.php
|
2018-08-02 18:33:54 +02:00 |
|
Laurent Destailleur
|
d84bacad00
|
Merge pull request #9196 from ATM-Nicolas/fix_wrong_variable_and_trigger_name
FIX : Wrong variable and trigger name
|
2018-08-02 17:43:16 +02:00 |
|
ATM-Nicolas
|
f3090e4819
|
FIX : Wrong variable and trigger name
|
2018-08-02 16:05:54 +02:00 |
|
Juanjo Menent
|
b29e6e1693
|
Merge pull request #9195 from grandoc/new_branch_02_08_2018
Uniformize
|
2018-08-02 15:05:24 +02:00 |
|
Philippe GRAND
|
ccabd2b859
|
Uniformize
|
2018-08-02 14:03:50 +02:00 |
|
Juanjo Menent
|
94ffda8862
|
Merge pull request #9188 from ptibogxiv/patch-30
update to Stripe Requirements and Best Practices
|
2018-08-02 11:37:49 +02:00 |
|
Juanjo Menent
|
b8efe3b239
|
Merge pull request #9172 from grandoc/new_branch_28_07_2018
standardize
|
2018-08-02 11:27:02 +02:00 |
|
Juanjo Menent
|
5b3c6de06c
|
Merge pull request #9184 from atm-gauthier/7.0_fix_extrafieldkey
FIX : extrafieldkey
|
2018-08-02 11:24:19 +02:00 |
|
Juanjo Menent
|
1fbbaf2895
|
Merge pull request #9180 from atm-florian/7.0
FIX: keep context filter on contact list on change column displayed
|
2018-08-02 11:20:25 +02:00 |
|
Juanjo Menent
|
788060aa28
|
Merge pull request #9178 from aspangaro/9.0_a3
NEW : Add project on salaries
|
2018-08-02 11:19:34 +02:00 |
|
Juanjo Menent
|
ce49230d71
|
Merge pull request #9177 from ATM-Nicolas/fix_preselect_project
FIX : Keep same project when creating shipping from order
|
2018-08-02 11:18:39 +02:00 |
|
Juanjo Menent
|
98dada47de
|
Merge pull request #9174 from tarrsalah/fix-soc-filter-on-supplier-invoices
FIX filter supplier invoice list by societe name.
|
2018-08-02 11:12:01 +02:00 |
|
Juanjo Menent
|
37a9a2df56
|
Merge pull request #9167 from frederic34/include
Include and co are statements
|
2018-08-02 11:03:44 +02:00 |
|
Juanjo Menent
|
03963dfe8a
|
Merge pull request #9163 from frederic34/nolink
fix no link in order list
|
2018-08-02 11:02:39 +02:00 |
|
Juanjo Menent
|
79a13403ae
|
Merge pull request #9162 from frederic34/extratotalize
NEW: Extrafield totalizable
|
2018-08-02 10:59:46 +02:00 |
|
Juanjo Menent
|
738caa605f
|
Merge pull request #9160 from hregis/develop_api
FIX compatibility with multicompany transverse mode
|
2018-08-02 10:57:27 +02:00 |
|
Juanjo Menent
|
e86a970332
|
Merge pull request #9156 from frederic34/patch-20
Update list.php
|
2018-08-02 10:56:01 +02:00 |
|
Juanjo Menent
|
f93519bc2e
|
Merge pull request #9155 from frederic34/patch-19
Update element_resource.php
|
2018-08-02 10:54:30 +02:00 |
|
Juanjo Menent
|
929d8fa66e
|
Merge pull request #9153 from frederic34/patch-17
Update payment.php
|
2018-08-02 10:52:07 +02:00 |
|
Juanjo Menent
|
ca717a7ce1
|
Merge pull request #9152 from frederic34/patch-12
Update card-rec.php
|
2018-08-02 10:50:50 +02:00 |
|
Juanjo Menent
|
82bdbd6f6e
|
Merge pull request #9151 from frederic34/patch-11
Update card.php
|
2018-08-02 10:50:05 +02:00 |
|
Juanjo Menent
|
2206eb98d1
|
Merge pull request #9191 from Dolibarr/revert-9147-7.0_price
Revert "FIX multicompany compatibility !"
|
2018-08-02 10:46:20 +02:00 |
|
Juanjo Menent
|
99f29a9764
|
Revert "FIX multicompany compatibility !"
|
2018-08-02 10:45:15 +02:00 |
|
Juanjo Menent
|
e6f416e745
|
Merge pull request #9147 from hregis/7.0_price
FIX multicompany compatibility !
|
2018-08-02 10:45:01 +02:00 |
|
Juanjo Menent
|
fcd9d49b16
|
Merge pull request #9159 from grandoc/new_branch_25_07_2018
Clean and update code
|
2018-08-02 10:36:27 +02:00 |
|
ptibogxiv
|
40b19b8e1d
|
update to Stripe Requirements and Best Practices
cf https://stripe.com/docs/partners/requirements
|
2018-08-01 11:50:43 +02:00 |
|
ptibogxiv
|
d50a95c89b
|
update to straipe
cf https://stripe.com/docs/building-plugins#setappinfo
|
2018-08-01 11:40:12 +02:00 |
|
Alexandre SPANGARO
|
ee61a88540
|
Small fix
|
2018-08-01 07:46:17 +02:00 |
|
gauthier
|
cadf931e8d
|
FIX : extrafieldkey
|
2018-07-31 15:02:51 +02:00 |
|
florian HENRY
|
5d19361782
|
fix: keep context filter on contact list on change column displayed
|
2018-07-31 11:39:54 +02:00 |
|
atm-quentin
|
37a4a0c488
|
fix for travis
|
2018-07-31 10:02:36 +02:00 |
|
Alexandre SPANGARO
|
0509a176ca
|
Merge branch 'develop' into 9.0_a3
|
2018-07-31 07:47:43 +02:00 |
|
Alexandre SPANGARO
|
b0e2e69ed0
|
New : Add project on salaries
|
2018-07-31 07:45:03 +02:00 |
|
Philippe GRAND
|
d673848028
|
standardize
|
2018-07-30 17:28:44 +02:00 |
|
ATM-Nicolas
|
1536bbc65e
|
FIX : Keep same project when creating shipping from order
|
2018-07-30 15:16:53 +02:00 |
|
Philippe GRAND
|
fb565b15c5
|
standardize
|
2018-07-29 19:16:28 +02:00 |
|
Philippe GRAND
|
d1f100b0c9
|
standardize
|
2018-07-29 17:17:29 +02:00 |
|