lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,350 Commits 43 Branches 150 Tags 886 MiB
3210181a3d
Commit Graph

59629 Commits

Author SHA1 Message Date
florian HENRY
06189f8153 Merge branch '6.0' into 6.0_fhe 2018-08-09 18:31:59 +02:00
florian HENRY
9024ed9e61 Merge branch '7.0' into 7.0_fhe 2018-08-09 17:47:21 +02:00
Frédéric FRANCE
79aaddbb66
test phpcs v3 2018-08-09 14:46:00 +02:00
Frédéric FRANCE
62b83412ee
test phpcs v3 2018-08-09 11:31:48 +02:00
Frédéric FRANCE
b00164ca39
test phpcs v3 2018-08-09 11:03:50 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
 2018-08-08 17:44:22 +02:00
Laurent Destailleur
8d54df4263 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2018-08-08 17:31:23 +02:00
Laurent Destailleur
63898b205e Clean ckeditor menu 2018-08-08 17:09:51 +02:00
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
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
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
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
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
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
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
ATM-Nicolas
f3090e4819 FIX : Wrong variable and trigger name 2018-08-02 16:05:54 +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
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
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
florian HENRY
ceb85cfa45 fix : odt project and task extrafields management 2018-07-31 17:29:08 +02:00
gauthier
cadf931e8d FIX : extrafieldkey 2018-07-31 15:02:51 +02:00
John BOTELLA
4ddca02bb9 fix situation line's total 2018-07-31 14:58:33 +02:00
ATM-Nicolas
b9a44fc76b FIX : Wrong position of firstname lastname 2018-07-31 12:15:18 +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
tarrsalah
8278a9fa52 FIX filter supplier invoice list by societe name. 2018-07-29 13:18:05 +01:00
Philippe GRAND
de70bf983e standardize 2018-07-29 13:40:35 +02:00
Philippe GRAND
69feb3af14 standardize 2018-07-29 11:33:52 +02:00
Philippe GRAND
892174cbf8 standardize 2018-07-29 10:29:12 +02:00
Frédéric FRANCE
7dada7ae8e
fix #8820 2018-07-29 09:15:42 +02:00
Philippe GRAND
36ea20b7d4 standardize 2018-07-28 18:03:14 +02:00
Philippe GRAND
9cc40fcb21 standardize 2018-07-28 17:26:56 +02:00