Marcos García de La Fuente
|
2dfced366e
|
NEW #2763 Go to document block after clicking in Generate document button
Close #2763
|
2017-02-03 20:11:06 +01:00 |
|
Laurent Destailleur
|
bda915c63a
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-02-03 15:34:59 +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
|
40737eac2e
|
FIX #6361
|
2017-02-02 02:49:04 +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
|
45263c85ec
|
Fix in emailing
|
2017-01-29 20:33:08 +01:00 |
|
Laurent Destailleur
|
ff8b7e6e4d
|
Fix size of email
|
2017-01-29 18:35:56 +01:00 |
|
Laurent Destailleur
|
92e61e6707
|
Fix hide url if not defined
|
2017-01-29 18:29:37 +01:00 |
|
Laurent Destailleur
|
756919de2a
|
Fix deadlock feature: could not solve a situation where an emailing was
validated by error.
|
2017-01-29 16:08:45 +01:00 |
|
Laurent Destailleur
|
b4b81d8dcb
|
Fix css and missing translation key
|
2017-01-29 15:07:18 +01:00 |
|
Laurent Destailleur
|
c48400331f
|
Merge pull request #6157 from atm-ph/new_develop_use_rate_on_document_date
NEW get multicurrency rate from document date (propal, order)
|
2017-01-27 01:32:52 +01:00 |
|
Laurent Destailleur
|
1878647d26
|
NEW Add statistics on supplier tab.
|
2017-01-23 20:54:52 +01:00 |
|
Laurent Destailleur
|
9a59fbada7
|
Fix missing info admin picto. Fix colspan.
|
2017-01-23 17:31:39 +01:00 |
|
Laurent Destailleur
|
7622d3b2fb
|
Fix missing info admin picto. Fix colspan.
|
2017-01-23 10:23:24 +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 |
|
Laurent Destailleur
|
809e3ce4d5
|
Debug browser notification
|
2017-01-20 20:10:16 +01:00 |
|
Juanjo Menent
|
2374aa351e
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2017-01-20 15:55:51 +01:00 |
|
Laurent Destailleur
|
5b8ff63981
|
Fix bad value
|
2017-01-20 14:17:58 +01:00 |
|
Laurent Destailleur
|
6780b20968
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-20 14:11:55 +01:00 |
|
Laurent Destailleur
|
2f4ff66c43
|
Minor fixes
|
2017-01-20 14:10:57 +01:00 |
|
Laurent Destailleur
|
94249b7926
|
NEW Add statistics on tabs
|
2017-01-20 14:03:07 +01:00 |
|
Laurent Destailleur
|
b4733e043c
|
Fix tooltip when customer is closed
|
2017-01-20 12:17:10 +01:00 |
|
Laurent Destailleur
|
412be59f78
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2017-01-20 12:09:39 +01:00 |
|
Laurent Destailleur
|
9bb9d4d36e
|
Fix position of field and tooltip
|
2017-01-20 12:08:33 +01:00 |
|
Marcos García de La Fuente
|
e0cbcadd98
|
In case Model for document generation is not defined, the criteria to select the model is now:
1. Model for the object
2. Custom default module
3. Hardcoded default module
|
2017-01-16 21:16:05 +01:00 |
|
Laurent Destailleur
|
4ecd657f34
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-01-16 00:02:43 +01:00 |
|
Laurent Destailleur
|
d14e4dbaba
|
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
|
2017-01-15 20:49:20 +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
|
6aa26e0f62
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/compta/paiement.php
htdocs/product/stock/massstockmove.php
htdocs/projet/info.php
htdocs/projet/tasks/time.php
htdocs/societe/class/societe.class.php
|
2017-01-13 16:49:18 +01:00 |
|
Juanjo Menent
|
6cc3ef0c99
|
NEW: Events notifications in browser
|
2017-01-13 16:08:49 +01:00 |
|
Laurent Destailleur
|
31818e8816
|
Fix missing translation
|
2017-01-13 15:32:20 +01:00 |
|
Laurent Destailleur
|
27c056d377
|
Avoid duplicate function error
|
2017-01-03 11:30:27 +01:00 |
|
Laurent Destailleur
|
b642a3a602
|
Prepare release 5.0
|
2016-12-31 16:35:56 +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
|
82052450a6
|
Complete work on dol_banner
|
2016-12-26 18:21:18 +01:00 |
|
Laurent Destailleur
|
bbd3734a21
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
|
2016-12-26 12:42:23 +01:00 |
|
Laurent Destailleur
|
e297b64722
|
Several security fix in using mailings.
|
2016-12-26 12:35:10 +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
|
a2133f391f
|
Complete work on dol_banner
|
2016-12-23 14:52:25 +01:00 |
|
Laurent Destailleur
|
b777ec79f2
|
Fix contextpage implementation into skeleton
|
2016-12-23 10:38:27 +01:00 |
|
Laurent Destailleur
|
9e44eb0d15
|
Fix return code REST similar for all api with POST
|
2016-12-23 02:08:22 +01:00 |
|
aspangaro
|
6caa3408ed
|
Remove field Skype. Already present in dol_banner_tab.
|
2016-12-22 06:23:43 +01:00 |
|
Laurent Destailleur
|
e50bbb05fa
|
Fix security bugs
|
2016-12-18 13:04:24 +01:00 |
|
Laurent Destailleur
|
9d3bd9d36f
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/errors.lang
|
2016-12-18 11:57:04 +01:00 |
|
Laurent Destailleur
|
12e919b99d
|
Merge pull request #6182 from atm-ph/fix_develop_user_right_write_margin
Fix user right write margin
|
2016-12-18 10:53:34 +01:00 |
|
Laurent Destailleur
|
394e284a4a
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/core/class/CMailFile.class.php
htdocs/langs/en_US/errors.lang
|
2016-12-18 02:16:40 +01:00 |
|
Laurent Destailleur
|
60b8582aa9
|
Fix more then 30 security defects
|
2016-12-18 01:44:26 +01:00 |
|
Laurent Destailleur
|
73e6663230
|
Fix help/messages for emailing to warn users.
|
2016-12-17 14:47:06 +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 |
|