2
0
forked from Wavyzz/dolibarr
Commit Graph

27 Commits

Author SHA1 Message Date
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
Laurent Destailleur
fc803e7000 Fix permission lost when enabled/disabled module. 2015-04-08 17:33:38 +02:00
Laurent Destailleur
c62687d198 Comment 2015-04-02 12:55:00 +02:00
Laurent Destailleur
d8db32a99c NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2
approvals to make a supplier order approved. Activating this option
introduce a new permission to the second level approval.
2015-04-01 21:00:51 +02:00
Laurent Destailleur
b83e9ea32f Merge branch 'loan' of https://github.com/frederic34/dolibarr into
frederic34-loan

Conflicts:
	htdocs/compta/bank/ligne.php
2015-03-30 02:56:26 +02:00
Laurent Destailleur
6ceda02eaa NEW: Enhancement of module 'Notification by Email'. Show nb of
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
2015-03-18 21:44:57 +01:00
frederic34
173d3aaa90 Translation error messages numbering modules 2015-01-11 11:31:53 +01:00
Laurent Destailleur
83122ebe1e Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now
for release.
2014-12-04 13:20:56 +01:00
Laurent Destailleur
47c982c506 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
2014-06-10 08:45:08 +02:00
Laurent Destailleur
5853b9eb30 Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1416

Conflicts:
	ChangeLog
2014-06-10 01:37:43 +02:00
Marcos García de La Fuente
0b73b44f34 Fix: [ bug #1416 ] Supplier order does not list document models in the select box of the supplier order card 2014-06-09 23:38:06 +02:00
Marcos García de La Fuente
8a22a708b4 Fixed the bug for supplier invoice and supplier order pages 2014-06-09 22:55:38 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Marcos García de La Fuente
31afd56897 Changed supplier module configuration page 2014-03-11 12:46:54 +01:00
simnandez
b5e10a061b [ task #1036 ] Normalized usage of setEventMessage instead of
dol_htmloutput_mesg
2013-08-20 16:50:33 +02:00
Laurent Destailleur
a1a8fac25c Merge remote-tracking branch 'origin/3.4' into develop 2013-06-03 11:15:15 +02:00
Marcos García
7b20757449 Fix: [bug #908] Erreur lors de la configuration du module 2013-06-01 15:51:17 +02:00
Laurent Destailleur
12681994ea Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/fichinter/fiche.php
2013-05-20 21:21:03 +02:00
Grand Philippe
5f714f1403 fix: wrong trad 2013-05-20 14:39:27 +02:00
Marcos García
edfcfb9bbd Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into translations-develop
Conflicts:
	htdocs/admin/commande.php
	htdocs/admin/expedition.php
	htdocs/admin/facture.php
	htdocs/admin/fichinter.php
	htdocs/admin/livraison.php
	htdocs/admin/supplier_invoice.php
	htdocs/admin/supplier_order.php
	htdocs/societe/admin/societe.php
2013-05-08 15:37:41 +02:00
Marcos García
3d5cb4e8de Style improvements in model document selector 2013-05-07 22:48:03 +02:00
Marcos García
54a2d3ca72 Corrected translations of info tooltips in document models description 2013-05-07 22:04:08 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Grand Philippe
e21e08717e normalize code 2013-04-08 16:06:57 +02:00
Grand Philippe
c44e9d6044 normalize and simplify code 2013-03-17 11:00:38 +01:00
Grand Philippe
88256b7531 normalize 2013-03-17 10:21:44 +01:00
Grand Philippe
7a69066dc8 enhancement of suppliers module 2013-03-16 15:24:14 +01:00