Commit Graph

72072 Commits

Author SHA1 Message Date
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
atm-quentin
c97e2db089 Merge branch '7.0' of github.com:Dolibarr/dolibarr into FIX_hook_update_price 2018-08-03 11:49:00 +02:00
atm-quentin
6662bf05ba FIX hook on update price AND fix id on line 2018-08-03 11:47:43 +02:00
Philippe
61e1f0508d FIX : Search on Ref project on order list 2018-08-03 11:08:09 +02:00
ATM-Nicolas
342a3ef663 NEW : Withdraw request massaction 2018-08-03 09:57:29 +02:00
ATM-Nicolas
70adfb135d FIX : Missing behavior 2018-08-03 09:51:29 +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
51effef629 Reset pagination when current page too high 2018-08-02 18:22:08 +02:00
Laurent Destailleur
17ed19503c Code comment 2018-08-02 17:51:04 +02:00
Laurent Destailleur
12fdbcce59 Fix trigger name 2018-08-02 17:49:05 +02:00
Laurent Destailleur
e85ec19018
Merge pull request #9093 from atm-gauthier/FIX_filters
FIX : page must always be 0 when we search
2018-08-02 17:48:35 +02:00
Laurent Destailleur
b5a0e14ffe
Merge pull request #9185 from atm-john/fix_situation_total_calcul
Important: fix situation line's total
2018-08-02 17:45:44 +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
2cf51fbdf1
Merge pull request #9173 from frederic34/patch-22
fix #8820
2018-08-02 11:08:47 +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