Laurent Destailleur
a890c7b3ab
Fix: Option to hide if no permission instead of grey was broken.
2013-03-24 03:51:49 +01:00
Laurent Destailleur
9391d0d2d6
New: SeparatorThousand and SeparatorDecimal accepts ' chars.
2013-03-24 03:12:40 +01:00
Laurent Destailleur
fe7cad8d6a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-24 02:28:29 +01:00
Laurent Destailleur
24427d2c65
Use combo list for revenue stamp
2013-03-24 00:35:40 +01:00
fhenry
d84cd86a50
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Merge Cron module
2013-03-23 20:24:28 +01:00
Laurent Destailleur
c3589e9785
Some debug into cron module:
...
- Because cron is a module, constant must start with CRON_.
- Miscellanous fixes.
- For external link to run jobs from url, we must forge url using conf
file and not autodetect url.
2013-03-23 19:23:17 +01:00
Laurent Destailleur
9fe0d2cdd2
Fix: Removed a lors 'pre'. Also accurency of data must not be overwrite
...
by odt template engine (to be compatible with all countries precision).
2013-03-23 18:22:25 +01:00
Laurent Destailleur
73de8d169f
Fix: Avoid call method on non object error
2013-03-23 18:04:46 +01:00
Laurent Destailleur
fbf8d410d2
New: Support revenue stamp onto invoices
2013-03-23 17:34:23 +01:00
fhenry
8971e6fe15
[ task #710 ] Envoi de mail
2013-03-23 14:39:23 +01:00
eldy
90025f9c13
Work on revenue stamp
2013-03-23 13:07:25 +01:00
eldy
c8d6e9e44a
Fix: List of customers to build invoice or order
2013-03-23 12:33:25 +01:00
eldy
3af7ca5ac8
Work on revenue stamp feature.
2013-03-23 12:23:09 +01:00
Regis Houssin
34bfdb1846
Fix: broken feature if the table has no field fk_parent_line
2013-03-22 19:21:46 +01:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
Laurent Destailleur
708f0472cd
Qual: Prepare menu handler to be able to output content into a list.
2013-03-22 16:40:35 +01:00
Laurent Destailleur
bf912e2c78
Fix: Some bug into supplier pdf invoice setup.
2013-03-19 15:19:31 +01:00
Christophe Battarel
e2f28b6c51
remove experimental commissions module
2013-03-18 15:40:56 +01:00
Laurent Destailleur
45a6717dd3
Merge pull request #752 from FHenry/develop
...
task #768 & task #769
2013-03-18 05:02:38 -07:00
Laurent Destailleur
c6b4259735
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-17 19:40:41 +01:00
Laurent Destailleur
7703537b96
New: Work on cron module
2013-03-17 19:39:53 +01:00
Grand Philippe
29b8ce1c2d
try to fix: supplier invoice numbering
2013-03-17 15:27:52 +01:00
Grand Philippe
6afa1cb2c9
normalize
2013-03-17 14:40:49 +01:00
Grand Philippe
57d20e28fb
normalize and simplify code
2013-03-17 12:56:54 +01:00
Grand Philippe
88256b7531
normalize
2013-03-17 10:21:44 +01:00
Grand Philippe
bda1c7656b
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-03-17 10:03:29 +01:00
Grand Philippe
d2c10159fe
try to fix : cannot display numbering models
2013-03-16 17:10:24 +01:00
Laurent Destailleur
33a7692fbc
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/exports/class/export.class.php
2013-03-16 17:07:35 +01:00
Laurent Destailleur
013b7eca10
Fix: A better fix for status/list of orders.
...
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
More explanation:
http://wiki.dolibarr.org/index.php/Module_Customers_Orders#Life_cycle_.2F_Business_rules
2013-03-16 17:02:13 +01:00
Grand Philippe
86dff79b73
try to fix : cannot display numbering models
2013-03-16 16:58:45 +01:00
Laurent Destailleur
2da3fb68a0
Merge pull request #751 from jfefe/extrasep
...
New type of extrafield : separator
2013-03-16 07:41:34 -07:00
Laurent Destailleur
ca0d3be33b
Merge pull request #750 from grandoc/develop
...
Develop
2013-03-16 07:40:05 -07:00
Laurent Destailleur
d590aa56eb
Merge pull request #749 from simnandez/3.3
...
Fix: Bad orders list viewstatut filter if expeditons module is disabled
2013-03-16 07:39:31 -07:00
Laurent Destailleur
fcef334122
Merge pull request #748 from GPCsolutions/naturalsearch
...
Natural search
2013-03-16 07:38:55 -07:00
Grand Philippe
7a69066dc8
enhancement of suppliers module
2013-03-16 15:24:14 +01:00
Grand Philippe
cdb521663e
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-03-16 10:35:12 +01:00
fhenry
cf21b32eb1
task #768
2013-03-16 09:46:34 +01:00
fhenry
98cc7b7a2b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-16 09:43:57 +01:00
fhenry
e71103ed02
task #768 :
...
https://doliforge.org/tracker/?func=detail&aid=768&group_id=144
task #769 :
https://doliforge.org/tracker/?func=detail&aid=769&group_id=144
2013-03-16 09:23:34 +01:00
jfefe
65a9edd5a7
Fix : lang
2013-03-16 01:52:56 +01:00
jfefe
5f1141675c
Add constants into config of ODT document for propal : can choose wich ODT will be used on creation and when close to bill or not.
2013-03-16 01:10:21 +01:00
jfefe
ba0963ea7d
Fix : implement separator extrafield - missing check on update
2013-03-16 00:00:57 +01:00
jfefe
b36b776f10
IKM : work on new extrafield separator type
2013-03-15 23:39:18 +01:00
Grand Philippe
7dbc782d42
prepair numbering models for supplier invoices
2013-03-15 19:03:07 +01:00
jfefe
b1d50e3f7f
Move extrafield type select list on top of form
2013-03-15 18:56:44 +01:00
jfefe
654e99df8c
Work on new type of extrafield : separator with no field stored in database
2013-03-15 18:56:10 +01:00
Grand Philippe
e46900ad84
prepair numbering models for supplier invoices
2013-03-15 18:40:31 +01:00
Laurent Destailleur
9bae946178
Fix: Return of function with no return should not be set into a
...
variable.
2013-03-15 18:27:48 +01:00
jfefe
74f480a53b
Merge remote-tracking branch 'upstream/develop' into extrafields
2013-03-15 18:21:03 +01:00
Laurent Destailleur
8a487a90af
New: Still working on menu manager rewrite.
2013-03-15 18:00:29 +01:00
