Alexandre SPANGARO
|
c06aedc54d
|
[FP17] : Add data in llx_accountancy_journal
|
2017-02-15 20:55:52 +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 |
|
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
|
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
|
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 |
|
Marcos García de La Fuente
|
5669f734b8
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2016-12-24 21:39:40 +01:00 |
|
Laurent Destailleur
|
46a8041143
|
Clean orphelins
|
2016-12-23 15:22:25 +01:00 |
|
Laurent Destailleur
|
cb4e0233b9
|
Fix orphelins
|
2016-12-23 15:21:38 +01:00 |
|
Laurent Destailleur
|
ba7ca3da6e
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop6
Conflicts:
htdocs/core/photos_resize.php
htdocs/install/mysql/data/llx_c_action_trigger.sql
|
2016-12-22 17:57:42 +01:00 |
|
Laurent Destailleur
|
3c79f3acb5
|
Minor fixes or code comment
|
2016-12-20 12:06:26 +01:00 |
|
Laurent Destailleur
|
08449a2d4f
|
Prepare action tracking on products
|
2016-12-20 12:05:00 +01:00 |
|
Laurent Destailleur
|
78bf209119
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
|
2016-12-18 02:21:57 +01:00 |
|
Laurent Destailleur
|
c750ba8b99
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
htdocs/install/mysql/data/llx_c_payment_term.sql
htdocs/langs/en_US/bills.lang
htdocs/langs/en_US/mails.lang
|
2016-12-16 13:56:55 +01:00 |
|
Laurent Destailleur
|
d32fd7aa11
|
FIX javascript xss injection and a translation
|
2016-12-15 11:55:33 +01:00 |
|
Laurent Destailleur
|
e1a5a90f0a
|
NEW Uploaded files are indexed into database
|
2016-12-13 00:15:21 +01:00 |
|
Laurent Destailleur
|
71d2ee3aa9
|
Fix default of a column
|
2016-12-12 20:30:21 +01:00 |
|
Laurent Destailleur
|
3396dfc7f6
|
NEW Index upload files into database.
|
2016-12-08 22:12:45 +01:00 |
|
Laurent Destailleur
|
788cbf9a01
|
Complete work on dol_banner on contracts
|
2016-12-04 13:30:17 +01:00 |
|
Laurent Destailleur
|
888c4cd2ad
|
Fix corrupted value for pointoftax field
|
2016-12-03 20:15:56 +01:00 |
|
Laurent Destailleur
|
17bc24e83e
|
Complete repair
|
2016-12-03 20:05:49 +01:00 |
|
Laurent Destailleur
|
fb2f33cfac
|
FIX Clean corrupted data
|
2016-12-03 19:48:08 +01:00 |
|
Laurent Destailleur
|
495ba00cb6
|
Fix: Slurp, database corruption due to missing unique key on main key.
|
2016-12-02 14:21:46 +01:00 |
|
Laurent Destailleur
|
0ec9dd9b88
|
Merge pull request #6048 from ozit/patch-1
an extra comma at the end
|
2016-11-29 23:37:41 +01:00 |
|
Laurent Destailleur
|
9ff38ee136
|
Add missing currency for madagascar
|
2016-11-29 12:28:17 +01:00 |
|