Alexandre SPANGARO
|
05e50e1027
|
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
|
2017-02-28 05:52:43 +01:00 |
|
Laurent Destailleur
|
4f24613de0
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expensereport/class/expensereport.class.php
|
2017-02-27 01:19:03 +01:00 |
|
Laurent Destailleur
|
92acbbd8a8
|
Fix parameters
|
2017-02-27 00:22:11 +01:00 |
|
Laurent Destailleur
|
63bee0c2d0
|
Doxygen
|
2017-02-24 16:23:43 +01:00 |
|
Laurent Destailleur
|
d0ee8c0e2d
|
Merge pull request #6458 from defrance/patch-83
inverted value between FRST & RECUR
|
2017-02-24 15:27:32 +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 |
|
BENKE Charlie
|
299551f851
|
inverted value between FRST & RECUR
|
2017-02-22 15:59:10 +01:00 |
|
Laurent Destailleur
|
a0fb53d5b1
|
Merge branch 'develop' into NEW_pdf_supplier_payment
|
2017-02-22 14:20:47 +01:00 |
|
Alexandre SPANGARO
|
942b58efaf
|
New : Integration of Stripe
|
2017-02-22 06:33:52 +01:00 |
|
Laurent Destailleur
|
89b52e24f6
|
Fix menu navigation
|
2017-02-22 02:41:21 +01:00 |
|
Laurent Destailleur
|
7ab600781d
|
NEW Move login information on home page into a widget
|
2017-02-21 11:57:52 +01:00 |
|
arnaud
|
26b8112d4e
|
FIX travis check
|
2017-02-20 09:22:57 +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 |
|
arnaud
|
fc0abe659a
|
NEW PDF with numbertoword
|
2017-02-17 16:39:36 +01:00 |
|
Laurent Destailleur
|
afa5ef2913
|
NEW Introduce fields that can be computed during export in export
profiles.
|
2017-02-17 00:19:28 +01:00 |
|
Laurent Destailleur
|
c3d78bf1b4
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/update.php
|
2017-02-16 22:09:37 +01:00 |
|
arnaud
|
977c18513d
|
FIX pdf supplier payment work
|
2017-02-14 12:00:56 +01:00 |
|
Laurent Destailleur
|
f5569ee890
|
Add tasktime_task_duration_sec tag in odt substitution
|
2017-02-11 13:50:30 +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 |
|
arnaud
|
4230b075c2
|
INIT pdf supplier payment
|
2017-02-10 17:28:00 +01:00 |
|
Laurent Destailleur
|
d463511cff
|
Fix: no way to know type of invoice.
|
2017-02-10 17:24:47 +01:00 |
|
Laurent Destailleur
|
5d94c8ddac
|
Merge pull request #6403 from laudeco/feature/expense_report_wrong_placement
[FIX] - Expense report on multiple page
|
2017-02-08 19:34:16 +01:00 |
|
Laurent Destailleur
|
4d16540207
|
Merge pull request #6393 from aspangaro/6.0-export
NEW : [FP17] Accountancy - Add export of charts of accounts
|
2017-02-08 19:22:26 +01:00 |
|
De Coninck Laurent
|
a042c30b28
|
fix nex line
|
2017-02-08 19:00:48 +01:00 |
|
Ion
|
22b85b3aba
|
Show delay in syslog
|
2017-02-08 17:30:51 +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
|
4c3255857c
|
Fix bad syntax into criteria to filter on date in export.
Fix missing type in export of invoices.
|
2017-02-08 10:45:20 +01:00 |
|
De Coninck Laurent
|
49e6192e62
|
fix the type width column and the nextY
|
2017-02-08 09:23:15 +01:00 |
|
Alexandre SPANGARO
|
e4fc52497e
|
New : [FP17] Accountancy - Add export of charts of accounts
|
2017-02-08 06:18:56 +01:00 |
|
Laurent Destailleur
|
2d77cb2da5
|
FIX #6379
|
2017-02-07 00:54:54 +01:00 |
|
Laurent Destailleur
|
8f52a34e71
|
Report of supplier payment is name "supplier_payments"
|
2017-02-06 20:37:42 +01:00 |
|
arnaud
|
7f6ab748c5
|
NEW add rapport file for supplier paiement
|
2017-02-03 16:42:06 +01:00 |
|
arnaud
|
6d3e43ddaf
|
NEW Report page and menu for suppliers paiements
|
2017-02-03 16:34:14 +01:00 |
|
Laurent Destailleur
|
bdca134e99
|
NEW Change to allow a specific numbering rule for invoice with POS
module.
|
2017-02-02 23:49:17 +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
|
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
|
5e4509953d
|
Associated product must be on another export profile
|
2017-01-29 21:25:29 +01:00 |
|
Laurent Destailleur
|
b4b81d8dcb
|
Fix css and missing translation key
|
2017-01-29 15:07:18 +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
|
0c14e1d233
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-01-27 01:24:55 +01:00 |
|
Laurent Destailleur
|
8a4e957554
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-01-27 01:23:44 +01:00 |
|
Laurent Destailleur
|
4c28e1598b
|
Merge branch '5.0' into 5.0
|
2017-01-27 00:25:12 +01:00 |
|
Laurent Destailleur
|
053afe21dd
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/user/class/user.class.php
|
2017-01-26 23:40:16 +01:00 |
|
Laurent Destailleur
|
c1b59b1950
|
Fix several security bugs on expense report
|
2017-01-26 18:08:00 +01:00 |
|
Laurent Destailleur
|
c39fcce9f1
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-26 10:45:38 +01:00 |
|
Laurent Destailleur
|
9889f0a4a2
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/modules/modProjet.class.php
htdocs/filefunc.inc.php
|
2017-01-26 10:44:50 +01:00 |
|
Laurent Destailleur
|
eac6ac0247
|
Fix fields into projet export
|
2017-01-26 10:41:02 +01:00 |
|