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
|
be0d5bee78
|
Fix phpcs
|
2017-03-23 20:07:46 +01:00 |
|
Laurent Destailleur
|
3adb43c6e5
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
|
2017-03-23 12:52:19 +01:00 |
|
Laurent Destailleur
|
7df9c25e60
|
Several fixes on multicurrency
|
2017-03-23 12:44:20 +01:00 |
|
Laurent Destailleur
|
b5e646daa0
|
NEW Show by default README.md file found into root dir of ext module.
|
2017-03-21 16:43:09 +01:00 |
|
Laurent Destailleur
|
a5c11dc840
|
NEW Add function dolMd2Html
|
2017-03-21 16:03:13 +01:00 |
|
Laurent Destailleur
|
1b0b4c9609
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-03-20 23:53:47 +01:00 |
|
Laurent Destailleur
|
b9a9997688
|
Page societe/soc.php and compta/facture.php was renamed into card.php
to match page naming conventions.
|
2017-03-20 21:29:22 +01:00 |
|
Laurent Destailleur
|
ac19aba07e
|
FIX multicurrency management on supplier order/invoice
Conflicts:
htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
|
2017-03-19 15:41:55 +01:00 |
|
Laurent Destailleur
|
e85206dee5
|
FIX multicurrency management on supplier order/invoice
|
2017-03-19 15:37:07 +01:00 |
|
Alexandre SPANGARO
|
16b12b33fc
|
First step : remove BANK_DISABLE_DIRECT_INPUT
|
2017-03-18 07:24:55 +01:00 |
|
Laurent Destailleur
|
35b79818b7
|
Uniformize css rules
|
2017-03-16 20:33:51 +01:00 |
|
Laurent Destailleur
|
d951114c18
|
Merge branch 'develop' into NEW_odt_others_objects
|
2017-03-14 10:44:05 +01:00 |
|
arnaud
|
192a825de8
|
NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class
|
2017-03-14 09:25:29 +01:00 |
|
Laurent Destailleur
|
d3e1a01273
|
Translation
|
2017-03-13 02:12:18 +01:00 |
|
Laurent Destailleur
|
520bdac510
|
Translation
|
2017-03-13 01:35:04 +01:00 |
|
Laurent Destailleur
|
4bf0e31299
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/loan.lang
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
|
2017-03-11 02:40:42 +01:00 |
|
Laurent Destailleur
|
8f338a155a
|
Fix last_insert_id at a better place
|
2017-03-10 15:19:15 +01:00 |
|
Laurent Destailleur
|
fd3837e1d5
|
Merge pull request #6492 from aspangaro/6.0-donation
NEW Add donations statistics in home statistics
|
2017-03-10 12:31:46 +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
|
1d31603ad2
|
Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9_dalibo
|
2017-03-10 11:46:59 +01:00 |
|
Laurent Destailleur
|
e44234a47f
|
NEW add property to show warnings when activating modules
|
2017-03-09 15:16:45 +01:00 |
|
Laurent Destailleur
|
c962daabac
|
NEW add property to show warnings when activating modules
|
2017-03-09 15:16:16 +01:00 |
|
arnaud
|
4a7e3fb387
|
NEW odt usergroup
|
2017-03-08 11:34:21 +01:00 |
|
Alexandre SPANGARO
|
fd0a46c5cf
|
New : add donations statistics in home statistics
|
2017-03-07 22:31:34 +01:00 |
|
Alexandre SPANGARO
|
6ce8aa7d6f
|
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
|
2017-03-07 22:08:23 +01:00 |
|
Laurent Destailleur
|
2a1060c0fc
|
Merge pull request #6475 from defrance/patch-87
Situation total row left a col if bank enabled
|
2017-03-05 21:39:02 +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 |
|
arnaud
|
cff9fa0e6b
|
FIX user odt
|
2017-03-03 12:01:58 +01:00 |
|
BENKE Charlie
|
83622c62be
|
Update pdf_crabe.modules.php
|
2017-03-01 21:54:30 +01:00 |
|
BENKE Charlie
|
a371b27564
|
better management of situation progress in pdf
|
2017-03-01 16:48:09 +01:00 |
|
Laurent Destailleur
|
3c54cb5ba9
|
Fix avoid trigger during migration
|
2017-02-28 20:55:14 +01:00 |
|
Laurent Destailleur
|
0f22beb774
|
Upgrade to ckeditor 4.6.2.
|
2017-02-28 10:49:58 +01:00 |
|
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 |
|