Laurent Destailleur
|
1c20bbb287
|
NEW Add index and constraints keys on supplier proposal detail table
|
2017-04-26 12:11:33 +02:00 |
|
Laurent Destailleur
|
e97e202deb
|
NEW Can import users
|
2017-04-17 04:22:53 +02:00 |
|
Laurent Destailleur
|
39ebaec064
|
Replace usage of $bc[$var] with class="oddeven"
|
2017-04-14 11:22:48 +02:00 |
|
Laurent Destailleur
|
a73d72f243
|
Add tables for default values
|
2017-04-14 10:14:23 +02:00 |
|
Laurent Destailleur
|
9678c2128e
|
Add field langs into extrafields definition table
|
2017-04-03 10:29:20 +02:00 |
|
Laurent Destailleur
|
cab944a1a1
|
Merge pull request #6602 from aspangaro/6.0-multijournal
New : [FP17] Accounting multi-journals
|
2017-03-31 17:45:10 +02:00 |
|
Laurent Destailleur
|
e416ea275e
|
Work on 6.0 look and feel
|
2017-03-28 21:04:38 +02:00 |
|
Laurent Destailleur
|
6bf61c677f
|
FIX #6586 Introduce processing status
|
2017-03-28 13:20:31 +02:00 |
|
Alexandre SPANGARO
|
fc2b9a858b
|
New : [FP17] Add multijournals in accountancy admin
|
2017-03-28 06:35:03 +02:00 |
|
Alexandre SPANGARO
|
aa924bf010
|
Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
# Conflicts:
# htdocs/install/mysql/migration/5.0.0-6.0.0.sql
|
2017-03-27 22:35:06 +02:00 |
|
Laurent Destailleur
|
278bbf184c
|
Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input
New : Add Various payment submodule linked to the accountancy to replace free input in bank
|
2017-03-24 22:52:39 +01:00 |
|
BENKE Charlie
|
80f78e66bb
|
error on install
|
2017-03-24 15:30:46 +01:00 |
|
Laurent Destailleur
|
f241bfefd0
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-03-23 20:20:59 +01:00 |
|
Laurent Destailleur
|
53a04703d6
|
Uniformize code
|
2017-03-23 16:10:38 +01:00 |
|
gauthier
|
6cecab4c92
|
FIX : forgottent fk_unit field on llx_supplier_propaldet
|
2017-03-22 16:43:12 +01:00 |
|
Alexandre SPANGARO
|
0e910616b6
|
Update table
|
2017-03-19 07:25:19 +01:00 |
|
Alexandre SPANGARO
|
8328c04624
|
2nd step : Add table
|
2017-03-18 08:12:29 +01:00 |
|
Laurent Destailleur
|
d951114c18
|
Merge branch 'develop' into NEW_odt_others_objects
|
2017-03-14 10:44:05 +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
|
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 |
|
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
|
e1a6e6e4ab
|
Rename "attributes" into "variants" to avoid confusion with extrafields
|
2017-02-08 12:37:38 +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
|
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
|
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
|
e1a5a90f0a
|
NEW Uploaded files are indexed into database
|
2016-12-13 00:15:21 +01:00 |
|