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
|
7ab600781d
|
NEW Move login information on home page into a widget
|
2017-02-21 11:57:52 +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 |
|
Laurent Destailleur
|
39151d7a74
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-22 12:14:18 +01:00 |
|
Laurent Destailleur
|
65f7de8f64
|
Fix css and look 5.0
|
2017-01-22 12:13:32 +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 |
|
Laurent Destailleur
|
2c6672d17a
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/login.tpl.php
|
2017-01-12 11:32:51 +01:00 |
|
Laurent Destailleur
|
749f8cf252
|
Fix translation
|
2017-01-12 00:15:00 +01:00 |
|
Alexis Algoud
|
65b956b011
|
NEW sql for inventory
|
2017-01-09 10:33:33 +01:00 |
|
Gustavo Novaro
|
3e77fed815
|
Fix missing ,
|
2017-01-08 01:59:04 -03:00 |
|
Laurent Destailleur
|
e9853f3cd7
|
Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into
Franck-MOREAU-develop
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
htdocs/loan/card.php
htdocs/loan/class/loan.class.php
htdocs/projet/element.php
|
2017-01-07 17:45:05 +01:00 |
|
Laurent Destailleur
|
1d291ee0e8
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-07 17:07:29 +01:00 |
|
Laurent Destailleur
|
4002ec9fd5
|
Fix css install and login
|
2017-01-06 15:51:08 +01:00 |
|
Laurent Destailleur
|
206335bc56
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-01-04 18:14:19 +01:00 |
|
Laurent Destailleur
|
983efdd6ee
|
FIX repair tool was ko to restore extrafields with type select.
|
2017-01-04 18:13:36 +01:00 |
|
Laurent Destailleur
|
febd23fe41
|
Clean dead code
|
2017-01-03 11:22:03 +01:00 |
|
Laurent Destailleur
|
728dd3f7b3
|
Add field ref into ecm_files table.
|
2017-01-03 11:06:24 +01:00 |
|
Laurent Destailleur
|
c27a1c1705
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-03 01:34:46 +01:00 |
|
Laurent Destailleur
|
598e559563
|
Fix migration
|
2017-01-02 19:30:12 +01:00 |
|
Laurent Destailleur
|
afe5c6b296
|
Fix migration
|
2017-01-02 18:44:11 +01:00 |
|
Laurent Destailleur
|
f023d6485f
|
Prepare 6.0 dev
|
2017-01-02 18:39:55 +01:00 |
|
Laurent Destailleur
|
7dc55daf38
|
FIX #6229
|
2017-01-02 14:37:07 +01:00 |
|
Ion Agorria
|
522fb4cf7a
|
Add email template for each line in object
|
2016-12-31 17:39:01 +01:00 |
|
Laurent Destailleur
|
f1961b0207
|
Work on sorting/indexing upload files
|
2016-12-31 03:43:22 +01:00 |
|
Marcos García de La Fuente
|
47a444b2ab
|
Merge branch 'develop' into prod-attr
|
2016-12-27 15:54:53 +01:00 |
|
Laurent Destailleur
|
b5c815367c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
|
2016-12-26 15:44:31 +01:00 |
|
Laurent Destailleur
|
b9e362833f
|
More complete label
|
2016-12-26 13:15:14 +01:00 |
|