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
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
a7ed40b10d
Fix: empty value if combobox disabled
2013-01-09 10:43:21 +01:00
Laurent Destailleur
091e469050
Fix: [ bug #622 ] attaching wrong file when sending the invoice via
...
e-mail
2013-01-07 00:40:18 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Christophe Battarel
0e144dd7c3
fix wrong test for localtax assuj check
2012-11-28 10:32:24 +01:00
Christophe Battarel
3b8f002e4f
display of total local taxes
2012-11-27 15:37:16 +01:00
Laurent Destailleur
cbff238cbd
New: Support property "required" for extra fields.
2012-10-25 16:23:58 +02:00
Regis Houssin
446a81b4c4
Fix: move class in template
2012-10-18 10:35:55 +02:00
Regis Houssin
b1ad840055
Fix: optimize code
2012-10-05 15:12:17 +02:00
simnandez
b7837f9280
Fix: Localtaxes type only missing in propal update line
2012-09-18 18:18:30 +02:00
simnandez
76f3fb56ea
Fix: Add type of product/service into propals for a correct localtaxes
...
calculation
Fix: Localtax2_type for Spain must be 3
2012-09-18 16:06:45 +02:00
Laurent Destailleur
07fa800360
Fix: Correct concat when mixing not html and html descriptions
2012-09-16 20:23:57 +02:00
Regis Houssin
43c0a03758
Fix: strict mode tornado
2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1
Fix: strict mode hurricane
2012-09-15 10:01:35 +02:00
Regis Houssin
f81b696890
Fix: code optimization
2012-08-31 09:25:27 +02:00
Regis Houssin
18b7549c52
Fix: use GETPOST('usenewaddlineform') instead MAIN_FEATURES_LEVEL
2012-08-31 08:51:08 +02:00
Regis Houssin
4054e5a8bd
Merge pull request #364 from marcosgdf/minor
...
Fixed a problem when adding line into proposal
2012-08-30 23:36:36 -07:00
Marcos García
bb99e4d40d
Fixed a problem when adding line into proposal
2012-08-31 07:49:00 +02:00
Marcos García
4209898d20
Lower-cased Header function
2012-08-31 05:58:38 +02:00
Regis Houssin
327e51ccd9
Fix: more simple
2012-08-29 17:40:13 +02:00
Regis Houssin
62a7847c5b
Fix: [ task #498 ] debug
2012-08-28 15:35:32 +02:00
Regis Houssin
ce9a16b341
Fix: button add not disabled
2012-08-28 14:42:46 +02:00
Regis Houssin
3e2be54ead
Fix: restore old method
2012-08-27 19:11:44 +02:00
Laurent Destailleur
0b42251dfd
Checkstyle
2012-08-26 23:13:18 +02:00
Laurent Destailleur
7db8c8aab9
Fix: Regression
2012-08-26 14:14:27 +02:00
