fhenry
f043fcfaf7
Fix bug [ bug #709 ]
2013-02-14 13:55:05 +01:00
fhenry
136dc651f3
Merge branch 'develop' into develop_merger_cust_prospect_tab
2013-02-12 19:18:15 +01:00
fhenry
82fc8e1536
Task 350 in Doliforge
2013-02-12 19:16:48 +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
fhenry
6ad617842d
Commit temporaire
2013-02-12 15:31:12 +01:00
Laurent Destailleur
6bbac00c22
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/user/fiche.php
2013-02-12 15:17:22 +01:00
Laurent Destailleur
ddf27b2c67
Fix Bug 708
2013-02-12 15:01:16 +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
simnandez
ad3645f7f4
Fix: [ bug #698 ] Bad calculation of totals of associated documents
2013-01-25 11:37:30 +01:00
simnandez
03d6903248
Fix: [ bug #698 ] Bad calculation of totals of associated documents
2013-01-24 12:53:42 +01:00
Regis Houssin
e8ce9cecf2
Fix: broken features, special_code also used by externals modules !
2013-01-22 21:36:30 +01:00
Regis Houssin
06a0da990b
Fix: broken features, special_code also used by externals modules !
2013-01-22 21:35:15 +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
0e13b3872d
Fix: Removed warnings
2013-01-19 14:32:37 +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
d11cee399a
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
COPYRIGHT
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +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
Laurent Destailleur
0b045a2d96
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/boxes/box_activity.php
htdocs/filefunc.inc.php
2013-01-16 14:11:19 +01:00
fhenry
ff06b05b3d
Fix Bug [ bug #681 ] Can't modify a line a business proposal
2013-01-15 23:04:42 +01:00
Laurent Destailleur
29e6d01e51
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-01-13 19:33:54 +01:00
Regis Houssin
9812c91aff
Fix: wrong EOL !!!!!!!
2013-01-10 08:27:12 +01:00
fhenry
e369d5dfd8
Fix [ bug #668 ] Event created with a profile is not visible by the same
...
profile
2013-01-09 20:34:36 +01:00
Regis Houssin
a7ed40b10d
Fix: empty value if combobox disabled
2013-01-09 10:43:21 +01:00
Regis Houssin
a278ae7371
Fix: empty value if combobox disabled
2013-01-09 10:40:36 +01:00
Laurent Destailleur
0889bdc3eb
Fix: Error using static method
2013-01-07 23:20:00 +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
Laurent Destailleur
96416735df
Fix: [ bug #618 ] External accounts can access confidential informations
...
(a lot)
2013-01-02 18:43:59 +01:00
Laurent Destailleur
cd6e3464db
Fix: Several fixes for bad management of external/internal users.
2013-01-02 14:35:16 +01:00
Laurent Destailleur
dbdc4e6ce8
Fix: Normalize option names
2012-12-31 13:40:13 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Laurent Destailleur
201829e60c
Fix:[ bug #653 ] Error while creating additional attributes
2012-12-30 13:49:37 +01:00
Marcos García
4af2a4f875
Improved agenda translations
2012-12-29 02:21:00 +01:00
Marcos García
c8eac78a8d
Translated labels that weren't being translated and improved es_ES translations
2012-12-29 00:24:55 +01:00
Laurent Destailleur
3aa9c75b0d
Fix: If thirdparty module not enabled, company and contact fields must
...
not be visibles
2012-12-21 17:56:40 +01:00
Laurent Destailleur
bcd2fead3d
Fix: patch from forum "User permissions on modAgenda"
2012-12-20 17:07:15 +01:00
Laurent Destailleur
e39ec132e5
Fix: Checkstyle
2012-12-19 20:59:08 +01:00
Laurent Destailleur
6952a5f465
Fix: syntax error
2012-12-18 15:00:35 +01:00
Regis Houssin
65090c582d
Fix: checkstyle
2012-12-15 11:39:47 +01:00
Laurent Destailleur
0c0653b3d8
Fix: Removed rubbish line
2012-12-14 18:34:24 +01:00
fhenry
0f07297329
variable spelling error
2012-12-13 17:33:53 +01:00
Laurent Destailleur
bdb112c820
Fix: Using bad root url.
2012-12-12 14:46:13 +01:00
Laurent Destailleur
f4459ee1f1
Fix: Regression detected by PHPUnit
2012-12-10 19:06:59 +01:00
fhenry
99f01f1dca
[Task 632] : Add standard extra field feature for Agenda
2012-12-08 12:49:20 +01:00
Laurent Destailleur
bac4bf07a3
New: Add patch from pgrand to start link of several contacts onto an
...
event
2012-12-03 20:19:35 +01:00
Laurent Destailleur
4136c27516
RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
...
commits !
2012-12-01 15:45:05 +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