Alexandre SPANGARO
|
6d5578a876
|
Reactivated constant BANK_DISABLE_DIRECT_INPUT
|
2017-03-19 20:47:30 +01:00 |
|
Laurent Destailleur
|
4831fb4dcb
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
|
2017-03-19 11:26:49 +01:00 |
|
Alexandre SPANGARO
|
0e910616b6
|
Update table
|
2017-03-19 07:25:19 +01:00 |
|
Laurent Destailleur
|
5871d59db9
|
Fix error "Invalid default value for 'date_price'"
|
2017-03-18 15:25:49 +01:00 |
|
Alexandre SPANGARO
|
8328c04624
|
2nd step : Add table
|
2017-03-18 08:12:29 +01:00 |
|
Alexandre SPANGARO
|
16b12b33fc
|
First step : remove BANK_DISABLE_DIRECT_INPUT
|
2017-03-18 07:24:55 +01:00 |
|
Laurent Destailleur
|
d951114c18
|
Merge branch 'develop' into NEW_odt_others_objects
|
2017-03-14 10:44:05 +01:00 |
|
arnaud
|
3ab7bac511
|
FIX fresh install const
|
2017-03-14 09:37:51 +01:00 |
|
arnaud
|
192a825de8
|
NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class
|
2017-03-14 09:25:29 +01:00 |
|
Alexandre SPANGARO
|
c6c07bf9f4
|
New : Add project to social contributions
|
2017-03-12 14:32:49 +01:00 |
|
arnaud
|
a796a321cc
|
Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/product/admin/product.php
htdocs/product/card.php
|
2017-03-10 12:16:55 +01:00 |
|
arnaud
|
4a7e3fb387
|
NEW odt usergroup
|
2017-03-08 11:34:21 +01:00 |
|
Laurent Destailleur
|
5f79b2d0c6
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2017-03-05 22:11:35 +01:00 |
|
Laurent Destailleur
|
f67c967d0b
|
FIX The vat rate line used when adding a predefined product was wrong if
there is several vat line with same rate.
|
2017-03-04 22:27:44 +01:00 |
|
Laurent Destailleur
|
832c91417a
|
Fix the default_vat_code was not correctly saved and shown on the
product price.
|
2017-03-04 19:16:09 +01:00 |
|
Laurent Destailleur
|
5d18aad15f
|
Add the vat_code on all table of prices
|
2017-03-04 14:18:04 +01:00 |
|
Laurent Destailleur
|
bef5f2c236
|
FIX #6465
|
2017-03-03 15:06:17 +01:00 |
|
Laurent Destailleur
|
28ad50e059
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/suppliers.lang
|
2017-03-03 14:31:35 +01:00 |
|
Laurent Destailleur
|
807eb56807
|
Add BHD currency
|
2017-03-03 13:15:20 +01:00 |
|
Laurent Destailleur
|
57b532cdd0
|
Fix status of opportunity is required if an amount is defined
|
2017-03-02 12:56:22 +01:00 |
|
Laurent Destailleur
|
8487f0fc96
|
Fix missing setup of new option
|
2017-03-01 11:18:11 +01:00 |
|
Laurent Destailleur
|
0f22beb774
|
Upgrade to ckeditor 4.6.2.
|
2017-02-28 10:49:58 +01:00 |
|
Laurent Destailleur
|
821324868a
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-27 12:15:31 +01:00 |
|
Laurent Destailleur
|
1f693ca586
|
Code comment
|
2017-02-27 12:07:14 +01:00 |
|
Laurent Destailleur
|
1ef899dacc
|
Prepare database to follow supplier discounts
|
2017-02-24 15:22:32 +01:00 |
|
Laurent Destailleur
|
a0fb53d5b1
|
Merge branch 'develop' into NEW_pdf_supplier_payment
|
2017-02-22 14:20:47 +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 |
|
Laurent Destailleur
|
847f408508
|
More complete repair
|
2017-02-17 20:47:22 +01:00 |
|
arnaud
|
4ec664029d
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment
|
2017-02-17 16:40:14 +01:00 |
|
Laurent Destailleur
|
8d03f86f45
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-17 13:10:46 +01:00 |
|
Laurent Destailleur
|
beaa56306c
|
Add united arab emirates to states.
|
2017-02-17 10:06:49 +01:00 |
|
Alexandre SPANGARO
|
c06aedc54d
|
[FP17] : Add data in llx_accountancy_journal
|
2017-02-15 20:55:52 +01:00 |
|
arnaud
|
977c18513d
|
FIX pdf supplier payment work
|
2017-02-14 12:00:56 +01:00 |
|
Laurent Destailleur
|
f4e64685e8
|
Merge pull request #6397 from apachler/develop
added additional payment terms often needed in Austria
|
2017-02-08 16:47:40 +01:00 |
|
Laurent Destailleur
|
072fa9987b
|
Update 4.0.0-5.0.0.sql
|
2017-02-08 16:47:27 +01:00 |
|
Andreas Pachler
|
c45b40075d
|
fixed typos
|
2017-02-08 12:55:03 +01:00 |
|
Andreas Pachler
|
ae3ace7e94
|
added additional payment terms often needed in Austria
|
2017-02-08 12:46:42 +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
|
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 |
|
Laurent Destailleur
|
b0ee04c079
|
FIX #6379
|
2017-02-07 01:13:50 +01:00 |
|
Laurent Destailleur
|
2d77cb2da5
|
FIX #6379
|
2017-02-07 00:54:54 +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
|
1785ef9957
|
Code comment
|
2017-02-02 00:59:07 +01:00 |
|
Laurent Destailleur
|
218e49298a
|
Uniformize field names
|
2017-01-31 14:10:06 +01:00 |
|
Laurent Destailleur
|
4cec071af5
|
Add tms field
|
2017-01-31 14:00:53 +01:00 |
|
Laurent Destailleur
|
fcfea4e6d1
|
Add missing field fk_user_modif
|
2017-01-27 13:26:31 +01:00 |
|
Laurent Destailleur
|
29df2c9115
|
Merge branch 'develop' into mail-lines
|
2017-01-27 01:29:58 +01:00 |
|
Marcos García de La Fuente
|
d09a3628c5
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/compta/facture.php
|
2017-01-14 23:59:14 +01:00 |
|