Marcos García
5b248805c2
Notifications popup messages were not showing real notifications that were going to be sent
2013-04-21 14:24:19 +02:00
fhenry
cba73b238c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/comm/propal.php
Change-Id: I5639c70165c8e1149f3934248737817a02efff0c
2013-04-16 11:37:51 +02:00
Laurent Destailleur
d3f29649d5
Fix into div/br
2013-04-16 01:23:33 +02:00
Laurent Destailleur
10ab1a583a
Look: Optimize screens
2013-04-16 01:13:20 +02:00
fhenry
acd3d136b5
[ task #798 ] Add range limit date on product/services as it is done on
...
order and invoice
2013-04-15 15:31:12 +02:00
Laurent Destailleur
b496436fe3
Qual: Reduce number of methods. Mutualize update_note code.
2013-04-10 10:58:38 +02:00
fhenry
275bf67bb7
[ task #811 ] Uniformanize note field
2013-04-09 17:18:07 +02:00
Laurent Destailleur
76910d4159
Look: Start to use div to render actions buttons
2013-04-03 18:37:54 +02:00
jfefe
cf6f4405cb
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields
...
Conflicts:
htdocs/comm/propal.php
2013-04-01 19:44:55 +02:00
jfefe
a8874ebcc8
Uniformize usage of extrafields methods
2013-04-01 19:43:26 +02:00
Laurent Destailleur
3c23a717fd
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/core/lib/files.lib.php
2013-03-30 14:10:15 +01:00
Laurent Destailleur
e0baa0fe46
Generalize fix: file with a specific mask not found, again
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/expedition/fiche.php
htdocs/fichinter/fiche.php
2013-03-30 14:04:09 +01:00
Laurent Destailleur
a5e66ab7ba
Generalize fix: file with a specific mask not found, again
2013-03-30 13:54:46 +01:00
jfefe
e99ba51f1d
Use of new function to set optionals from add / update form
...
Format date display for data from JS calendar (date type extrafield)
2013-03-30 10:46:23 +01:00
jfefe
f3a7d497c6
Fix : missing object when calling function
2013-03-29 22:30:07 +01:00
jfefe
6c872395e3
Fix: syntax error
2013-03-29 22:26:25 +01:00
jfefe
649c1f3721
Try new function to set array_options to object (extrafields values) with date sent by forms
2013-03-29 22:25:02 +01:00
jfefe
6aae37493c
Add support of calendar on date type extrafield on propal
2013-03-29 22:14:06 +01:00
Regis Houssin
888da9f3e9
Fix: file with a specific mask not found
2013-03-29 11:52:18 +01:00
jfefe
ee52e1a487
Merge remote-tracking branch 'upstream/develop' into propal_odt_choice
2013-03-27 15:25:13 +01:00
jfefe
47b6829e17
Remove DOS EOF (dos2unix utility used)
2013-03-27 14:39:41 +01:00
fhenry
8971e6fe15
[ task #710 ] Envoi de mail
2013-03-23 14:39:23 +01:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
jfefe
8a3fae31e1
When create a propal, select model document chosen by defaut in module config
2013-03-16 01:13:44 +01:00
jfefe
7a16e1b658
Show extrafield separator in propale
2013-03-15 23:41:24 +01:00
Laurent Destailleur
b0d7b33815
Merge pull request #715 from jfefe/extrafields
...
[ task #746 ] add extrafields support on propal object
2013-03-11 08:44:59 -07:00
Laurent Destailleur
9eae775837
Merge remote-tracking branch 'origin/3.3' into develop
2013-03-11 14:35:08 +01:00
Laurent Destailleur
710ea872a9
Merge pull request #727 from cbattarel/3.3
...
fix wrong value name when updating buyingprice
2013-03-11 06:25:35 -07:00
Christophe Battarel
f620e6948f
fix wrong value name when updating buyingprice
2013-03-11 09:08:57 +01:00
jfefe
ba8525bd6a
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields
...
Conflicts:
htdocs/install/doctemplates/invoices/template_invoice.odt
htdocs/install/doctemplates/proposals/template_proposal.odt
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-11 05:21:35 +01:00
Laurent Destailleur
a6ce7bb428
Fix: Regression for negative proposal lines.
...
Conflicts:
htdocs/comm/propal.php
2013-03-08 10:28:25 +01:00
Laurent Destailleur
ffa2c2fb58
Oops, bad fix
2013-03-08 10:22:30 +01:00
Laurent Destailleur
f041a8a95e
Fix: Regression for negative proposal lines.
2013-03-08 10:06:23 +01:00
jfefe
7d3c35fb90
Merge branch 'extra_propal' into extrafields
2013-03-06 01:41:47 +01:00
jfefe
61127e82f6
User must have write permission to edit extrafields on propale
2013-03-06 01:33:55 +01:00
jfefe
9eee5f9509
Fix : extrafields for propale were note saved after creation
2013-03-06 00:18:41 +01:00
Laurent Destailleur
c37e873ab4
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
2013-03-05 18:32:01 +01:00
jfefe
59627408c0
Edit extrafields on propal
2013-03-04 19:17:11 +01:00
jfefe
f335c4f306
New : add extrafield support on propal object
2013-03-04 18:22:25 +01:00
fhenry
f793ed83f6
Fix [ bug #747 ]
2013-03-04 15:36:40 +01:00
simnandez
7d9d575e40
[ task #731 ] Uniformize ref generation. Propals
2013-03-02 15:57:26 +01:00
eldy
e99b0dd96f
Fix: Select prospect, customer or both
2013-02-21 21:11:21 +01:00
Laurent Destailleur
aa8413d7cb
Fix: Missing migration
...
Fix: Error management
2013-02-17 16:20:49 +01:00
Laurent Destailleur
3eb485d521
Qual: Removed TODO, deprecated code and deprecated properties. This also
...
fix missing combo box of contacts onto CC.
2013-02-12 17:08:21 +01:00
simnandez
ad91eab0ac
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
...
Uniformize propal code (not use addpropal.php)
2013-02-02 18:31:45 +01:00
Regis Houssin
fcee35c65d
Fix: $hookmanager is a global object
2013-01-26 10:35:30 +01:00
Laurent Destailleur
56e11e52fa
New: hookmanager class is used frequently and is a factory object, so we
...
can move it during init of environment and use it globally.
2013-01-25 19:12:54 +01:00
Laurent Destailleur
abb6daf2dc
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/boxes/box_activity.php
2013-01-19 16:29:16 +01:00
Laurent Destailleur
3551dff18a
Fix: [ bug #671 ] Product country origin is automatically entered in
...
description of invoices, but not in invoices generated from orders
2013-01-19 15:57:28 +01:00
Laurent Destailleur
a5b174eccc
Fix: Architecture of getCurrency was wrong. Cache was not stored
...
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
2013-01-18 15:57:11 +01:00
