Jan
|
c007ea62a7
|
wrong position of counter reset
extrafields will work now ;) and not the first product gets the last extrafields values
|
2018-08-09 20:57:32 +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 |
|
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 |
|
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 |
|
Ferran Marcet
|
c74ffade7d
|
New: Sales representative column on Propal List
|
2018-08-07 10:05:50 +02:00 |
|
ATM-Nicolas
|
5b15e688af
|
FIX : PHP warning, undefined index notnull
|
2018-08-07 09:38:18 +02:00 |
|
Philippe GRAND
|
094fc6b699
|
Standardize
|
2018-08-06 11:53:33 +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 |
|
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 |
|
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 |
|
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
|
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 |
|