Laurent Destailleur
|
10838983b5
|
FIX error management in bank account deletion.
|
2017-02-27 11:38:19 +01:00 |
|
Laurent Destailleur
|
024cecec29
|
FIX Error management during bank account creation
|
2017-02-27 11:16:46 +01:00 |
|
Laurent Destailleur
|
0f8a8869cb
|
FIX Error management during bank account creation
|
2017-02-27 11:15:59 +01:00 |
|
Laurent Destailleur
|
cff284b2f3
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/compta/bank/categ.php
|
2017-02-27 10:55:18 +01:00 |
|
Laurent Destailleur
|
9ecc56ad4d
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2017-02-27 10:48:36 +01:00 |
|
Laurent Destailleur
|
3aaf9dae11
|
Fix parameter to cal cron method
|
2017-02-27 00:12:48 +01:00 |
|
Laurent Destailleur
|
29578a38bd
|
Keep previous behaviour if new option not set
|
2017-02-24 16:19:00 +01:00 |
|
Laurent Destailleur
|
7ee6dc7fa6
|
Merge pull request #6388 from atm-ph/new_deposit_with_multi_tva_management
New deposit with multi tva management
|
2017-02-24 16:16:33 +01:00 |
|
Laurent Destailleur
|
fb88eaf2a4
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2017-02-23 02:55:50 +01:00 |
|
Alexandre SPANGARO
|
942b58efaf
|
New : Integration of Stripe
|
2017-02-22 06:33:52 +01:00 |
|
Laurent Destailleur
|
19e60f03b9
|
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
|
2017-02-21 14:17:44 +01:00 |
|
Laurent Destailleur
|
ebe625aa16
|
Fix debug direct debit module
|
2017-02-21 13:16:28 +01:00 |
|
Laurent Destailleur
|
eef3824f8c
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/categories.php
htdocs/admin/dict.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/bills.lang
|
2017-02-21 10:34:52 +01:00 |
|
Raphaël Doursenaud
|
b697da7399
|
Fix: [Payments] Properly escape variable for JS
The company name may contain reserved characters such as a quote
which needs proper escaping to prevent upsetting the JavaScript
interpreter.
|
2017-02-17 16:16:41 +01:00 |
|
Laurent Destailleur
|
498473715e
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-17 01:48:43 +01:00 |
|
Laurent Destailleur
|
4c310964a9
|
Fix list of supplier proposals
|
2017-02-17 01:41:33 +01:00 |
|
Laurent Destailleur
|
4a8006b330
|
Fix style
|
2017-02-16 23:15:47 +01:00 |
|
Laurent Destailleur
|
d72e5a3646
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-10 17:34:23 +01:00 |
|
Laurent Destailleur
|
ca67917e80
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/modules/modFacture.class.php
|
2017-02-10 17:33:32 +01:00 |
|
Laurent Destailleur
|
d461c0dfa4
|
Fix left align
|
2017-02-10 10:47:19 +01:00 |
|
Laurent Destailleur
|
66542b6367
|
Fix translation and link to direct debit payment
|
2017-02-10 10:43:54 +01:00 |
|
phf
|
579d350599
|
Fix keep the standard behaviour
|
2017-02-09 17:41:06 +01:00 |
|
gauthier
|
c01988ba43
|
FIX : delete bank class lines when we delete bank_categ
|
2017-02-09 17:28:37 +01:00 |
|
florian HENRY
|
ab0783edcc
|
FIX #6234
|
2017-02-08 17:18:06 +01:00 |
|
Laurent Destailleur
|
e1a6e6e4ab
|
Rename "attributes" into "variants" to avoid confusion with extrafields
|
2017-02-08 12:37:38 +01:00 |
|
Laurent Destailleur
|
b24f244f67
|
Merge pull request #5533 from marcosgdf/prod-attr
Feature Request: NEW Added product attributes feature
|
2017-02-08 11:20:33 +01:00 |
|
Laurent Destailleur
|
b611c5ca53
|
Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
NEW Develop new reduc on excess received
|
2017-02-08 11:16:10 +01:00 |
|
Laurent Destailleur
|
31c3398b7f
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/modules.php
|
2017-02-08 10:59:05 +01:00 |
|
phf
|
6b20bad847
|
add fixme
|
2017-02-07 11:14:27 +01:00 |
|
phf
|
0f421dc2b4
|
New global conf MAIN_DEPOSIT_MULTI_TVA to manage multi tva on deposit
|
2017-02-07 11:09:18 +01:00 |
|
Laurent Destailleur
|
8f52a34e71
|
Report of supplier payment is name "supplier_payments"
|
2017-02-06 20:37:42 +01:00 |
|
Laurent Destailleur
|
6cb3199824
|
Translation message
|
2017-02-06 12:03:20 +01:00 |
|
Marcos García de La Fuente
|
d06fb423c0
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
|
2017-02-02 20:07:41 +01:00 |
|
Laurent Destailleur
|
13f37b2cb9
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-02 02:25:49 +01:00 |
|
Laurent Destailleur
|
f6144b9ecb
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-02-02 02:24:57 +01:00 |
|
Laurent Destailleur
|
8f0ddf2b8c
|
Merge pull request #6342 from simnandez/5.0
Fix #6314 Sorting balance error
|
2017-02-02 01:03:21 +01:00 |
|
Laurent Destailleur
|
18f3e11c10
|
Merge pull request #6339 from atm-maxime/fix_numbering_display_error
Fix numbering was disaplying technical error instead of error message
|
2017-02-02 00:49:18 +01:00 |
|
Laurent Destailleur
|
c3fb559d3b
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/modProduct.class.php
|
2017-02-01 20:58:17 +01:00 |
|
Laurent Destailleur
|
24c21cca27
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-01-28 15:56:27 +01:00 |
|
Laurent Destailleur
|
4f76626f51
|
FIX Creation of credit note on invoice with deposit stole the discount.
|
2017-01-28 15:55:44 +01:00 |
|
Laurent Destailleur
|
fd90bf466b
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/societe/soc.php
|
2017-01-28 15:12:14 +01:00 |
|
Laurent Destailleur
|
c88e63ecc9
|
FIX #6259
|
2017-01-28 15:01:17 +01:00 |
|
Juanjo Menent
|
3e14a89eb0
|
Fix #6314
|
2017-01-27 23:05:29 +01:00 |
|
Maxime Kohlhaas
|
7b6488b1c7
|
Fix numbering was disaplying technical error instead of error message
|
2017-01-27 10:05:57 +01:00 |
|
Laurent Destailleur
|
70091eceed
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expensereport/card.php
|
2017-01-27 01:26:11 +01:00 |
|
Laurent Destailleur
|
f2f8d7b6a5
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-01-27 01:21:34 +01:00 |
|
Laurent Destailleur
|
9f1959ffc8
|
Fix MVC Actions must be done before output
|
2017-01-27 01:21:20 +01:00 |
|
Laurent Destailleur
|
ade8fd1415
|
Fix table format
|
2017-01-27 01:20:56 +01:00 |
|
florian HENRY
|
28115689e8
|
fix : wrong $formproject->select_projects call on model invoice
|
2017-01-26 08:46:39 +01:00 |
|
Quentin Vial-Gouteyron
|
94b42021bd
|
fix payment method
|
2017-01-24 15:15:31 +01:00 |
|