Commit Graph

1235 Commits

Author SHA1 Message Date
Regis Houssin
b5d13dc6e6 Fix: missing parameter 2013-03-26 18:33:23 +01:00
Regis Houssin
e9a8457d7e Fix: broken features due to the removal of the trigger FILE_UPLOAD ! 2013-03-26 18:33:14 +01:00
Regis Houssin
a701cbd77c Fix: wrong var name 2013-03-26 17:47:37 +01:00
Regis Houssin
4fe94b800b Fix: missing parameter 2013-03-26 17:43:48 +01:00
Regis Houssin
dff74667c2 Fix: broken features due to the removal of the trigger FILE_UPLOAD ! 2013-03-26 17:29:40 +01:00
Sébastien de Chateauvieux
28999af70b TVA NPR : set function get_default_npr 2013-03-26 08:47:17 +04:00
Laurent Destailleur
4fb4734eed Merge pull request #772 from grandoc/develop
fix : trad error
2013-03-24 15:08:24 -07:00
Laurent Destailleur
4e029bf2ca Fix: Security does not need special case 2013-03-24 21:06:45 +01:00
Laurent Destailleur
3ef8bf55fa Fix: Better line position of information 2013-03-24 16:17:36 +01:00
Laurent Destailleur
ff2407a454 Add hidden option to setup font size of information. 2013-03-24 14:01:33 +01:00
Grand Philippe
c5e742278e fix : trad error 2013-03-24 07:11:44 +01:00
Laurent Destailleur
9391d0d2d6 New: SeparatorThousand and SeparatorDecimal accepts ' chars. 2013-03-24 03:12:40 +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
350bcea183 Merge 2013-03-22 17:10:17 +01:00
Laurent Destailleur
f522b18bdc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-15 17:14:06 +01:00
Laurent Destailleur
2ab28d974f Fix: Use better test to show localtax to avoid problem when switching
from different country.
Perf: Can return all localtaxes in one call.
2013-03-15 17:10:18 +01:00
Laurent Destailleur
a86c6ac39d New: price function can show price with currency symbol. 2013-03-15 15:59:51 +01:00
fhenry
9f9f6c8311 [ task #767 ] 2013-03-15 11:59:15 +01:00
Laurent Destailleur
fbdf438351 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-03-14 17:01:44 +01:00
Laurent Destailleur
9729e83e66 Fix: Do not use deprecated function
New: ajax constant on off can be reversed
2013-03-13 23:05:34 +01:00
Laurent Destailleur
5149ea9f51 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-13 11:10:51 +01:00
Laurent Destailleur
60930d9e74 New: Enhance Dolibarr migration process to include migration script of
external modules.
2013-03-13 11:06:28 +01:00
Laurent Destailleur
390921512c Move info message on top right 2013-03-12 15:56:47 +01:00
BENKE Charles
425ed19e20 Update sendings.lib.php
delivery_prepare_head 
complete_head_from_modules object->id 
but the good one is $object->origin_id
so we temporary change it
2013-03-11 21:01:04 +01:00
Laurent Destailleur
e1bf659db5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-11 16:49:37 +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
5bc66318c2 New: use dolGetFirstLastname() everywher we should. 2013-03-11 15:54:01 +01:00
Laurent Destailleur
d8af59756d New: Add function dolGetFirstLastname 2013-03-11 10:11:43 +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
dbba8fd6ba New: Can force picto path so an external module can use it with its own
picto
2013-03-10 13:23:55 +01:00
Laurent Destailleur
3e5ee3b00a Fix: PHPUnit tests are back. 2013-03-09 18:55:57 +01:00
Laurent Destailleur
0f1741a06b New: hooks for pdf_writelinedesc now implement the rule to overwrite or
not default code (http://wiki.dolibarr.org/index.php/Hooks_system)
2013-03-09 15:05:09 +01:00
Laurent Destailleur
72749bfc5f Merge pull request #721 from frederic34/develop
Print IPP
2013-03-08 08:31:15 -08:00
Laurent Destailleur
0fe91796ef New: [ task #696 ] Remove "new stdClass();" when possible 2013-03-08 15:52:23 +01:00
frederic34
cdb1242bb5 Print IPP fix and printer icon 2013-03-08 11:38:30 +01:00
Laurent Destailleur
3defd294cb Merge remote-tracking branch 'origin/3.3' into develop 2013-03-07 11:08:15 +01:00
jfefe
1690c77aa2 Merge branch 'extra_invoice' into extrafields
Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-07 01:48:27 +01:00
jfefe
88a042ec41 Prepare invoice admin page to add extrafield support 2013-03-06 03:36:43 +01:00
jfefe
7d3c35fb90 Merge branch 'extra_propal' into extrafields 2013-03-06 01:41:47 +01:00
fhenry
617a71478b fix [ bug #749 ] 2013-03-05 19:05:12 +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
Laurent Destailleur
555b3a1199 Fix:; Removed warning 2013-03-04 21:00:22 +01:00
jfefe
f335c4f306 New : add extrafield support on propal object 2013-03-04 18:22:25 +01:00
Laurent Destailleur
51d23d7c48 Merge fix of 3.3 2013-03-02 16:17:12 +01:00
Laurent Destailleur
f172c900c7 Qual: Uniformize menu code 2013-03-02 14:43:36 +01:00
simnandez
0cb5b3f50c Fix: Localtax2 for Spain must be based into buyer 2013-03-01 20:32:49 +01:00
Laurent Destailleur
7bbbda2dce New: dol_syslog method accept a suffix to use different log files for
log.
2013-02-28 16:19:16 +01:00
Grand Philippe
d8edb3c074 display enhancement for models 2013-02-26 17:41:08 +01:00
Grand Philippe
79c2e17cbb english language standardization 2013-02-25 17:56:41 +01:00
Grand Philippe
ffeb066b1b Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-25 10:30:48 +01:00
Laurent Destailleur
ae322ba17f Qual: Better init of default lang 2013-02-25 10:17:38 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
d27568d3d0 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-25 08:16:43 +01:00
Laurent Destailleur
b4329cb5d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-24 18:22:57 +01:00
Laurent Destailleur
234e171e9d New: Add option dol_hide_topmenu and dol_hide_leftmenu onto login page. 2013-02-24 18:16:26 +01:00
Laurent Destailleur
a6378ab0bb Cleaner HTML code 2013-02-24 18:08:27 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Grand Philippe
8c765ace99 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-24 15:30:39 +01:00
Grand Philippe
7596096b89 some fix for english language standardization 2013-02-24 14:46:00 +01:00
Laurent Destailleur
0b61c740a9 Fix: To be sure to start onto an selected top menu 2013-02-24 13:57:17 +01:00
Grand Philippe
c9f91a6082 english language standardization 2013-02-23 17:01:10 +01:00
Grand Philippe
ac0e99bc1a english language standardization 2013-02-23 16:21:49 +01:00
Grand Philippe
844433d0a2 english standardization 2013-02-22 17:11:53 +01:00
Laurent Destailleur
2852aded3a New: Add button collapse/expand for menu, category and user views. 2013-02-20 21:16:31 +01:00
Laurent Destailleur
320b4bde1f Qual: Code to output tree is now generic 2013-02-20 19:01:29 +01:00
Laurent Destailleur
6db881c09d New: Add link collapse all - expand all.
Fix: Add missing images.
2013-02-20 18:34:54 +01:00
jfefe
1941efa45a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into webservices 2013-02-20 11:15:15 +01:00
Laurent Destailleur
d07c5ae49f Merge pull request #669 from simnandez/develop
Fix: Translation
2013-02-19 12:11:06 -08:00
Laurent Destailleur
9ddd6215f8 Qual: Replace native code with jquery plugin treeview. 2013-02-19 20:15:30 +01:00
simnandez
94d1f6e0c2 Fix: sourcecompany now works with state instead departement (deprecated)
into build_address
2013-02-19 16:05:55 +01:00
simnandez
9e3497cff3 New: Add ES formated address country rule 2013-02-19 16:02:58 +01:00
Laurent Destailleur
4119fde0e5 Merge pull request #665 from FHenry/develop
Fix mass mailing tabs regression
2013-02-18 07:46:07 -08:00
fhenry
fd4a465c90 Fix mass maling tabs regression 2013-02-18 15:25:13 +01:00
Laurent Destailleur
da7b5e352f Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	
New: Add function dol_set_focus('#xxx')
2013-02-18 15:01:00 +01:00
fhenry
3694031053 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-17 21:41:27 +01:00
Laurent Destailleur
e0bbb78f56 Fix: Merge customer and prospect tab 2013-02-15 17:28:07 +01:00
fhenry
c02bd08711 Checkstyle 2013-02-14 16:35:54 +01:00
fhenry
ff214dd295 Manage tabs (add/remove by external module) for mass emalings screen 2013-02-14 16:25:43 +01:00
jfefe
e2d03a9dba Add possibility to disable hook on list of recent file 2013-02-14 13:15:23 +01:00
fhenry
82fc8e1536 Task 350 in Doliforge 2013-02-12 19:16:48 +01:00
Maxime Kohlhaas
51800a0dd5 Security : add phtml extension to be dealed as php extension 2013-01-30 16:52:33 +01:00
Laurent Destailleur
30764a6c00 Fix: Option COMPANY_USE_SEARCH_TO_SELECT was not working for third party
selection when autocomplete is on.
2013-01-29 16:14:53 +01:00
Laurent Destailleur
180fb2c91a Fix: Option COMPANY_USE_SEARCH_TO_SELECT was not working for third party
selection when autocomplete is on.
2013-01-29 15:22:07 +01:00
Laurent Destailleur
dde8738999 Qual: Add a protection to detect bad usage of getStaticMember 2013-01-28 11:30:28 +01:00
Regis Houssin
647cbb08fb Fix: wrong EOL 2013-01-26 10:38:11 +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
9f44161e55 New: Can attach file for trip and expenses module 2013-01-24 12:47:06 +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
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
f650888ea6 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-18 12:17:21 +01:00
Laurent Destailleur
57a869683d Fix date function 2013-01-18 11:28:06 +01:00
Laurent Destailleur
6091f74b13 New: First changes to simplify/optimize menu management. 2013-01-17 18:39:15 +01:00
Laurent Destailleur
f1f7ff315f Fix: CRLF 2013-01-16 15:54:07 +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
f57409ddcd Merge remote-tracking branch 'origin/3.3' into develop 2013-01-15 12:06:41 +01:00
Laurent Destailleur
285bcbecb7 Fix: init of new syslog handler system 2013-01-14 17:12:13 +01:00
Laurent Destailleur
6746e76564 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 12:24:06 +01:00
Maxime Kohlhaas
6abf682faa Multi-company compatibility with transverse mode for pdf models 2013-01-14 12:01:44 +01:00
Laurent Destailleur
07ba988cf8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 11:45:16 +01:00
Laurent Destailleur
297c10d16b Qual: externalise code of merging PDFs into a library. 2013-01-14 11:39:30 +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
Laurent Destailleur
9d886eca53 Fix: Scan of correct dir when them dir is forced 2013-01-10 11:19:46 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Regis Houssin
9a305c9066 New: add date format with second 2013-01-10 06:13:02 +01:00
Laurent Destailleur
abccfdd168 Fix: Option SERVICE_ARE_ECOMMERCE_200238EC 2013-01-09 19:56:43 +01:00
Regis Houssin
dd08da6ea8 Merge pull request #583 from FHenry/develop
[ task #664 ] Add extrafields behaviours to Member Type
2013-01-08 10:58:46 -08:00
fhenry
23b2aa6a7b [ task #664 ] Add extrafields behaviours to Member Type 2013-01-08 19:16:39 +01:00
Laurent Destailleur
9b6289503c Fix: Overwriting of login template works with module_parts. 2013-01-08 18:30:49 +01:00
Laurent Destailleur
9d47b812b9 New: Support module_parts['theme'] 2013-01-08 15:21:56 +01:00
Laurent Destailleur
ec3421d59e New: Add option MAIN_FORCETHEME (differs from MAIN_FORCETHEMEDIR) 2013-01-08 13:45:52 +01:00
Laurent Destailleur
142f171e50 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/.gitignore
2013-01-08 11:10:47 +01:00
Laurent Destailleur
77f177d846 Fix: Bad selection of option 2013-01-08 11:04:29 +01:00
Laurent Destailleur
6d036699bb Qual: Uniformize usage of array module_parts. 2013-01-07 13:28:14 +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
Marcos García
ad5d2c3459 Added missing translations, improved es_ES translations and translated untranslated text in modules admin page 2013-01-05 19:23:16 +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
380d036d5c Fix: Bad test onto project list id 2013-01-02 15:12:46 +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
35a9fbda59 Merge pull request #556 from marcosgdf/3.3
Improved translations
2012-12-29 07:29:29 -08:00
Laurent Destailleur
ca6e9643ea Fix: Pb in json function for objects 2012-12-29 12:21:13 +01:00
Laurent Destailleur
7d60c33c1a Fix: typo 2012-12-29 12:16:45 +01:00
Laurent Destailleur
17a3204578 Fix: dol_json_encode was wrong with objects 2012-12-29 06:51:12 +01:00
Marcos García
bae8a749b8 Replaced 'Tel' string with 'Phone' to allow translation 2012-12-29 02:51:35 +01:00
Laurent Destailleur
f566cd4d99 Fix: Use date of user to define if an action is in past or future. 2012-12-27 15:43:52 +01:00
Laurent Destailleur
251f4f3742 Fix: Avoid duplicate link 2012-12-27 15:33:18 +01:00
Laurent Destailleur
e39ec132e5 Fix: Checkstyle 2012-12-19 20:59:08 +01:00
Laurent Destailleur
78a1354a52 Fix: Solve phpunit regression.
Include an option to support local tax of type 7 (need more time to
validate this type).
2012-12-19 18:51:49 +01:00
Laurent Destailleur
e9d7a4adc6 Fix: Removed warnings 2012-12-19 15:29:27 +01:00
Laurent Destailleur
11ab579639 Fix: Several fixes to avoid PDF lib conflicts. 2012-12-19 13:06:45 +01:00
Laurent Destailleur
4cc44292e7 Fix: Maxi debug of holiday module 2012-12-18 13:12:11 +01:00
Regis Houssin
65090c582d Fix: checkstyle 2012-12-15 11:39:47 +01:00
Laurent Destailleur
c36d013971 Fix: Link missing 2012-12-14 17:55:42 +01:00
Regis Houssin
b09a44701e Fix: wrong EOL 2012-12-13 13:08:03 +01:00
Laurent Destailleur
a11e4b5124 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-12 19:02:38 +01:00
Laurent Destailleur
c107697dc1 Fix: Var not always initialized 2012-12-12 18:14:21 +01:00
Laurent Destailleur
e2e86e16d0 Merge pull request #537 from grandoc/develop
Develop
2012-12-12 07:01:54 -08:00
Laurent Destailleur
bdb112c820 Fix: Using bad root url. 2012-12-12 14:46:13 +01:00
Grand Philippe
a91a96e72e merge 2012-12-10 10:02:13 +01:00
Laurent Destailleur
6a60b78b28 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-08 14:25:36 +01:00
Laurent Destailleur
db91526643 Fix: Solve conflict into migration/backup/restore (child tables
must be after parent tables).
Fix: Migration of old version
2012-12-08 14:16:39 +01:00
fhenry
99f01f1dca [Task 632] : Add standard extra field feature for Agenda 2012-12-08 12:49:20 +01:00
Regis Houssin
be7d545297 Fix: wrong variable name 2012-12-07 10:50:16 +01:00
Regis Houssin
7ff3002993 Fix: Check if amount is numeric, for example, an error occured when
amount value = o (letter) instead 0 (number)
2012-12-07 10:47:36 +01:00
Laurent Destailleur
4a5062283d Merge pull request #515 from atm-maxime/develop
New : option to reset numbering to 0 every month using @99 in the mask
2012-12-05 04:19:16 -08:00
Maxime Kohlhaas
5992ebcdbc New : option to reset numbering to 0 every month using @99 in the mask 2013-02-06 11:52:49 +01:00
Regis Houssin
3d4621327c Fix: EOL !! tant que ce problème sera présent, les risques de problèmes
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
2012-12-05 11:18:45 +01:00
Laurent Destailleur
e3d07621eb Fuck git. Restore another lost commit. 2012-12-04 20:51:45 +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
fd22705de4 New: Log handler can now manage indent on database transactions 2012-12-02 15:20:45 +01:00
Laurent Destailleur
d578d0be2b Perf: Log optimize. Saved 10KB of memory. 2012-12-02 14:33:24 +01:00
Laurent Destailleur
d428549e15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-02 13:51:52 +01:00
Laurent Destailleur
6fcc32b326 Comments 2012-12-02 12:59:06 +01:00
Regis Houssin
00aa22e1d7 Fix: wrong EOL 2012-12-02 11:03:23 +01:00
Christophe Battarel
c3aa626e18 function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model. 2012-12-02 10:52:53 +01:00
Christophe Battarel
785491ca2c add function gettypeoflocaltax and modify pdf models 2012-12-02 10:51:18 +01:00
Laurent Destailleur
09bb10b2a6 Restore lost commit 2012-12-01 15:50:39 +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
Laurent Destailleur
bba1492621 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-01 12:23:12 +01:00
Laurent Destailleur
daacf797c4 Merge pull request #500 from cbattarel/develop
[Task #204] more local taxes manangement
2012-12-01 02:49:45 -08:00
Laurent Destailleur
31b37c5aff Fix: Length not hard coded 2012-12-01 11:31:02 +01:00
Laurent Destailleur
624c0fa040 Fix: Restore compatibility with FPDF. 2012-11-30 20:31:43 +01:00
Laurent Destailleur
9d17b8f96c Fix: Label not complete 2012-11-30 19:39:22 +01:00
Laurent Destailleur
008f5fbcfc New: extrafields are available onto users cards. 2012-11-30 15:55:59 +01:00
Laurent Destailleur
b12469c562 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/holiday/fiche.php
2012-11-29 23:12:16 +01:00
Laurent Destailleur
184cced303 New: Implement all call to allow to remove a tab by an external module 2012-11-29 23:02:02 +01:00
Regis Houssin
583dfb225c New: add possibility to force label of buttons and hide the second
button for dialog info only
2012-11-29 18:30:16 +01:00
Christophe Battarel
51d87f8f4a function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model. 2012-11-29 11:36:59 +01:00
Christophe Battarel
e459736977 add function gettypeoflocaltax and modify pdf models 2012-11-28 17:47:15 +01:00
Maxime Kohlhaas
5e5cb1da92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-28 14:53:48 +01:00
Laurent Destailleur
caab5ac4e0 New: Add option to be able to select onto automatic event and manual
event (or both) into calendar view. Note: For backward compatibility
reason, this will works only for new events.
Qual: Disable old deprecated event code.
2012-11-28 14:47:30 +01:00
Laurent Destailleur
b34ce6e2f0 Merge pull request #495 from cbattarel/develop
[ task #204 ] Manage canadian, spain and other country double VAT with a generic system. various updates for local taxes
2012-11-28 02:08:07 -08:00
Maxime Kohlhaas
32f5b4efa6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-11-28 10:57:51 +01:00
simnandez
8dc0aec754 [ task #204 ] Manage canadian, spain and other country double VAT with a
generic system. Add spanish tests
2012-11-27 16:52:52 +01:00
Christophe Battarel
9f03b56348 dont put global local tax on lines 2012-11-27 15:33:11 +01:00
Laurent Destailleur
c9edac9cd6 Try to fix differently pb of change/keyup because current change has a
regression (no way to use ajax select onto supplier orders when using
keybord or mouse selection).
2012-11-26 13:33:18 +01:00
Maxime Kohlhaas
437d082308 Fix : multicompany comptability 2012-11-24 00:06:54 +01:00
Laurent Destailleur
e76ef823b8 New: Add a tab into members statistics to count members by nature. 2012-11-21 23:01:36 +01:00
Laurent Destailleur
ddb3cf6f42 Fix: Debug holiday module 2012-11-20 13:14:16 +01:00
Laurent Destailleur
a62583e987 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-20 12:33:24 +01:00
Regis Houssin
a3d9b5788c Fix: use keyup instead change to avoid loosing the product id
Fix: strict mode
2012-11-20 12:09:52 +01:00
Laurent Destailleur
e53f6a383d Fix: Removed a hard coded error code. 2012-11-20 11:23:34 +01:00
Laurent Destailleur
0fb126a7e3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-19 17:30:57 +01:00
Laurent Destailleur
3b861598a7 Doc 2012-11-19 17:29:57 +01:00
simnandez
3fe79b379d Fix: Bad calculation of localtax amount calculation if type of
localtaxes are 1 3 or 5. Researched by Eldy
2012-11-19 17:10:28 +01:00
Laurent Destailleur
e0de91144a Merge pull request #484 from simnandez/develop
Fix: Local taxes. If buyer not subject to localtax no need make database
2012-11-18 03:11:37 -08:00
Laurent Destailleur
61ed6e10e1 Uniformize code 2012-11-16 18:59:03 +01:00
simnandez
5515f15187 Fix: Localtaxes rules for spain 2012-11-16 16:23:51 +01:00
simnandez
b7f38def61 Fix: Local taxes. If buyer not subject to localtax no need make database
access
2012-11-16 12:13:29 +01:00
Laurent Destailleur
511a75b5de Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-14 18:59:07 +01:00
Laurent Destailleur
4c4eeaac2a Fix: Test fails if value is 0 2012-11-14 18:56:47 +01:00
Regis Houssin
8908f977b8 Fix: converting line delimiters !!! 2012-11-14 11:31:08 +01:00
Laurent Destailleur
3dd9d20d53 Add alternative picto for rendez-vous. 2012-11-14 00:59:52 +01:00
Regis Houssin
4ec1d376bf Fix: strict mode journey 2012-11-13 09:02:21 +01:00
Laurent Destailleur
831fe6a29e Fix: More fix about the new localtax system 2012-11-06 23:45:16 +01:00
Laurent Destailleur
f37c559235 Fix: regression 2012-11-06 19:23:23 +01:00
Laurent Destailleur
8896803921 New: We can use a dynamic value ($conf->global->XXX for example) into
titles of menus.
New: Can choose menu entry to show with external site module.
2012-11-04 21:19:12 +01:00
Laurent Destailleur
078b015db8 Work on multitax (vat). Need your test.
Qual: Because params were often missing in calculate_price(), params are
now mandatory.
2012-11-03 16:32:49 +01:00
Laurent Destailleur
f87865f039 Fix: crazy pagebreak when warterwark is higher than free space. 2012-11-02 14:21:32 +01:00
Laurent Destailleur
9b1f70e58e Fix: Trick to solve easily problem of font for some foreign users. 2012-10-31 19:38:16 +01:00
Laurent Destailleur
f6d9b2abe3 New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT,
MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of
generated PDF.
Qual: Use 2 different var for reserver footer height and free text
height.
2012-10-31 13:48:59 +01:00
Regis Houssin
0e0bbbeddc Fix: morning strict mode 2012-10-31 09:50:20 +01:00
Laurent Destailleur
066bcbb469 Qual: Add dol_format_address PHPUnit tests 2012-10-31 01:45:48 +01:00
Laurent Destailleur
6f9c9fcd55 Fix: Free text overlap data when not on last page. 2012-10-30 13:11:17 +01:00
Laurent Destailleur
9d44590980 Fix: Using a more precise function to calculate free texts height avoid
having few pixels offset on free texts.
2012-10-30 11:17:49 +01:00
Regis Houssin
b952a7f9bf Fix: convert line delimiters (use the last eclipse version) 2012-10-28 13:57:21 +01:00
Laurent Destailleur
443f5ca03e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-10-27 00:23:54 +02:00
Laurent Destailleur
7a48351909 Fix: delete file from ecm module 2012-10-27 00:23:16 +02:00
Laurent Destailleur
0d48682eed Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-10-26 17:59:39 +02:00
Regis Houssin
48ce43d6f1 New: add export filters (thank you Charles Benke) 2012-10-25 22:30:17 +02:00
Laurent Destailleur
a60516ae0d Fix: Show warning only if transaction level not correct 2012-10-25 14:16:06 +02:00
Regis Houssin
30430953de Fix: missing row and col parameters 2012-10-23 09:33:07 +02:00
Regis Houssin
2f15857dab Fix: add mobile phone in contact list
TODO: Fax is obsolete and not used by several companies
2012-10-22 11:20:59 +02:00
Regis Houssin
6329344df2 Fix: broken features
Fix: use entity O for all entities
2012-10-22 09:15:08 +02:00
Laurent Destailleur
70cf195fb4 Fix: removed test code 2012-10-19 09:34:31 +02:00
Laurent Destailleur
657d0197b6 Fix: json is a fuck... sh... 3 hours to find a bug ! (json fails
without any warning when converting non utf8 strings).
2012-10-18 16:30:12 +02:00
Laurent Destailleur
319b512157 Fix: Avoid empty messages 2012-10-17 19:02:21 +02:00
Laurent Destailleur
c4ce66d784 Enhance error management 2012-10-17 18:47:18 +02:00
Marcos García
df2262f8be Stopped using (un)serialize functions but json functions 2012-10-16 12:18:05 +02:00
Marcos García
07dcb07fd2 Created a modular syslog handler system
I've split all log handlers into classes so that people can make
new log handler systems without making changes to the core.
Also, now every log handler can handle how and what will be logged.
2012-10-16 02:01:37 +02:00
Marcos García
59e8964bc5 Fixed PHP warning on MailmanSPIP module
Also simplified the code and removed unused variables from it
2012-10-14 23:56:28 +02:00
Regis Houssin
478449da37 Fix: convert line delimiters 2012-10-08 20:47:10 +02:00
Laurent Destailleur
5c6b0c064e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-10-04 15:43:28 +02:00
Laurent Destailleur
9ba100a84b New: Support removing tab into member module 2012-10-04 15:37:10 +02:00
Laurent Destailleur
59a33db53d Fix: Add warning to ask refresh. 2012-10-03 20:10:29 +02:00
Regis Houssin
bcf46d00f0 Fix: convert line delimiters !! 2012-09-30 21:26:58 +02:00
Regis Houssin
d23188c64a Fix: doxygen 2012-09-30 20:49:13 +02:00
Laurent Destailleur
a98de7ef02 Fix: No error when hour not provided 2012-09-27 13:25:31 +02:00
Regis Houssin
1919604089 Fix: more compatible with multicompany transverse mode
Fix: strict mode bubbles
2012-09-27 11:57:46 +02:00
Laurent Destailleur
051b93c73b Qual: Code cleaner using field name instead of index number.
New: Can use new syntax to define parent of a menu
(fk_mainmenu=&fk_leftmenu=)
2012-09-27 00:05:13 +02:00
Christophe Battarel
67333522b0 add ability to remove a product tab if it's defined in a module description 2012-09-25 14:42:58 +02:00
Laurent Destailleur
043e5edc2c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-24 21:37:36 +02:00
Laurent Destailleur
7d83fdce5b Fix: Several fixes into date functions
Qual: Add PHPUnit tests
2012-09-24 21:37:19 +02:00
Regis Houssin
c268a62cab Fix: try to disable 1900 test 2012-09-24 09:30:37 +02:00
Laurent Destailleur
a6b2eab439 Revert bad fix.
Unit tests are back ok (when tag is @6 or @=, yearoffset
is not zero but must not be applied when replacing yyyy). 
Compatibility with 3.2 is also restored.
2012-09-23 22:09:54 +02:00
Regis Houssin
d147c360d3 FIXME: this code is useless, $yearoffset is 0 by default 2012-09-23 17:05:08 +02:00
Laurent Destailleur
7fac6b65f6 Fix: Fix for compatibility with previous version and for case "@=".
Qual: Add a lot of phpunit tests to validate all get_next_value()
cases.
2012-09-23 16:25:08 +02:00
Regis Houssin
e721c6e723 Fix: more simple too 2012-09-22 10:40:12 +02:00
Regis Houssin
1e3cecf25c Fix: can use {yy}{mm} or {mm}{yy} 2012-09-22 10:33:25 +02:00
Regis Houssin
6151bc3a42 Fix: more simple 2012-09-22 09:18:36 +02:00
Regis Houssin
eee4434850 Fix: update doc 2012-09-22 09:03:38 +02:00
Regis Houssin
d48f494eb0 Fix: check fiscal date and new year 2012-09-22 08:53:10 +02:00
Regis Houssin
ba1b282c3b Fix: remove unused code 2012-09-21 11:28:28 +02:00
Regis Houssin
50b0dcf47e New: try to use new tag 2012-09-21 11:23:31 +02:00
Laurent Destailleur
5e9cd37107 Uniformise look of PHP Info page. 2012-09-21 00:13:20 +02:00
Regis Houssin
d58c106f66 Fix: convert line delimiters !!! 2012-09-19 17:53:09 +02:00
Laurent Destailleur
533e285dad Merge pull request #403 from simnandez/develop
Trad: Add ca_ES and es_ES translations
2012-09-19 05:53:43 -07:00
Laurent Destailleur
0e76bd7ac6 Fix: Blank page when renaming a product ref 2012-09-19 14:11:01 +02:00
Laurent Destailleur
d1cfe2ec54 Fix: Bug when metafile is on 2012-09-19 13:30:59 +02:00
Laurent Destailleur
1347ecf14e Qual: Removed warnings 2012-09-19 12:49:58 +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
Regis Houssin
8bab5fdadd Fix: convert line delimiters 2012-09-17 19:37:02 +02:00
Regis Houssin
58ae3b9372 Fix: possibility to disable hook 2012-09-17 19:36:43 +02:00
Regis Houssin
dc7100677a Fix: avoid warning if no object 2012-09-17 16:28:37 +02:00
Laurent Destailleur
3953be53a7 Qual: Mutualize code
New: Can use extrafields on contacts/addresses.
2012-09-17 01:39:30 +02:00
Laurent Destailleur
07fa800360 Fix: Correct concat when mixing not html and html descriptions 2012-09-16 20:23:57 +02:00
Laurent Destailleur
b724a78cb3 Fix: Debug dictionnary to add localtaxes 2012-09-16 15:04:55 +02:00
Laurent Destailleur
d48f294531 New: [ task #289 ] Reorder tasks 2012-09-15 15:33:00 +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
be13602c71 Fix: use getDocumentsLink method 2012-09-15 09:02:20 +02:00
Laurent Destailleur
e7d3d9496c first step for extrafield for contact/address 2012-09-14 12:15:55 +02:00
Regis Houssin
7eef637776 Fix: strict mode killer 2012-09-13 11:52:50 +02:00
Regis Houssin
5770245805 Fix: rename the hook 2012-09-12 19:37:37 +02:00
simnandez
2e37084c55 Fix: If price is 'TTC' we need to have the totals without VAT for a
correct
calculation
Fix: The updateline of propal must include the localtaxes totals
2012-09-12 17:48:45 +02:00
Laurent Destailleur
dd66ebd3f6 New: Use GB address format 2012-09-12 17:39:02 +02:00
Regis Houssin
664ceb7f2c Fix: This is a 'superglobal', there is no need to do 'global $variable;'
to access it within functions or methods.
2012-09-12 14:55:39 +02:00
Regis Houssin
a2f1107bfc Fix: add GET in hook parameters 2012-09-12 14:49:36 +02:00
Regis Houssin
7358223c8f Fix: convert line delimiters 2012-09-12 12:41:44 +02:00
Regis Houssin
b75efdcf10 Fix: regression, replace triggers by hooks 2012-09-12 12:27:11 +02:00
Laurent Destailleur
8fd384373a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-12 10:57:09 +02:00
Regis Houssin
2557320f8d Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-12 10:47:17 +02:00
Regis Houssin
71d5191ff7 Fix: duplicate parameters 2012-09-12 10:46:35 +02:00
Stephen L
8fcf20227a Fix: definition of all substitution functions is no more required
Signed-off-by: Stephen L. <lrq3000@gmail.com>
2012-09-11 20:15:03 +02:00
Laurent Destailleur
54be534506 Add comment and renamed file to be sure new function is not called
directly. Not sure it's a good idea to have dolDeleteFile separated
since it must be called only by dol_delete_file.
2012-09-11 20:06:37 +02:00
Regis Houssin
b39c9c514a Fix: split into 2 functions 2012-09-11 18:52:23 +02:00
Regis Houssin
f95d611f12 New: add hooks in dol_delete_file and list_of_documents methods 2012-09-11 17:08:10 +02:00
Laurent Destailleur
12b42ab1b4 Doc 2012-09-11 01:53:15 +02:00
Laurent Destailleur
ef00d592e7 Fix: Backward compatibility with spain. 2012-09-11 01:42:50 +02:00
Laurent Destailleur
e68f861923 New: Add more test and enhancement to make new calcul_price function
more reliable. We need to add more PHPUnit test case on this function
(testcase using localtax1 and localtax2).
2012-09-11 01:09:34 +02:00
Christophe Battarel
c6da5b79fe change localtaxes parameters to be compatible with older calls 2012-09-10 16:49:36 +02:00
Christophe Battarel
8c11da1df8 readapt to 3.3 2012-09-10 16:01:20 +02:00
Christophe Battarel
4cca760feb calculate prices with generic local taxes management 2012-09-10 15:47:33 +02:00
Laurent Destailleur
a551fa982e Comments 2012-09-08 21:29:03 +02:00
Laurent Destailleur
ce64a26875 A different fix to keep username. 2012-09-08 15:18:14 +02:00
Regis Houssin
ee1cf819f7 Fix: mass convert line delimiters 2012-09-07 17:23:16 +02:00
Regis Houssin
b6dc20fb90 Fix: send $varfiles instead _FILES 2012-09-07 10:58:29 +02:00
Regis Houssin
e725ef0eef Fix: find $upload_dir in first part of $dest_file 2012-09-07 10:54:56 +02:00
Laurent Destailleur
0dfc9e59fe New: Creation of meta file works for all elements. Disabled by default. 2012-09-07 10:30:02 +02:00
Regis Houssin
171f25d3b2 Fix: getDirList is ambiguous, this method can return dir list or files
list. Method is renamed to "getNodesList"
2012-09-07 08:47:10 +02:00
Regis Houssin
b6f090eeef Fix: add notrigger parameter 2012-09-07 08:09:07 +02:00
Laurent Destailleur
13d6024a9f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-09-07 00:15:08 +02:00
Laurent Destailleur
1275a41244 New: Start to work on position of tasks into a project 2012-09-07 00:14:50 +02:00
Laurent Destailleur
28e7b73d21 Enhancement of holiday module 2012-09-06 23:58:09 +02:00
Regis Houssin
83fbaac70d New: add hook in dol_move_uploaded_file method and split function with
dol_check_uploaded_file method
2012-09-06 21:30:44 +02:00
Laurent Destailleur
221b671636 New: The signature feature is full ok now. 2012-09-06 19:07:51 +02:00
Regis Houssin
b5ba6ef4d9 Fix: broken feature, enable source details by default 2012-09-06 12:37:36 +02:00
Regis Houssin
720d0d99b0 Fix: strict mode 2012-09-06 12:36:55 +02:00
Regis Houssin
4f056c707c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-05 14:33:00 +02:00
Regis Houssin
c18375d7ee Fix: broken features
$reshook may contain returns stacked by other modules
$reshook is always empty with an array for can not lose returns stacked
with other modules
$hookmanager->resArray may contain array stacked by other modules
2012-09-05 14:30:12 +02:00
Laurent Destailleur
a3cb0e502e Uniformize code and add comment on localtax to prepare usage for other
countries.
2012-09-05 14:05:17 +02:00
Laurent Destailleur
0e1dcb9408 Use a more standard behaviour: If hook return non zero, it is a "replace
code" hook. Otherwise, it is "insert code" hook.
2012-09-05 13:05:24 +02:00
Regis Houssin
86f3c8eb26 Fix: return an array 2012-09-05 12:38:39 +02:00
Regis Houssin
696c7eb454 Fix: use require instead include_once 2012-09-05 11:22:52 +02:00
Regis Houssin
1933bd4b50 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-09-05 10:17:33 +02:00
Regis Houssin
6bd571b31a New: add hook 'getDirList' in dol_dir_list() method 2012-09-05 10:17:02 +02:00
Laurent Destailleur
cc38fbe33f Uniformize code 2012-09-05 09:58:35 +02:00
Laurent Destailleur
105cb2373c Add comment 2012-09-05 04:13:31 +02:00
Regis Houssin
7f6bf34362 Try to use blockUI 2012-09-04 09:38:38 +02:00
Regis Houssin
2130571712 New: try jquery blockUI plugin 2012-09-03 22:05:13 +02:00
Regis Houssin
15db85bc86 Fix: prepare external extended ged 2012-09-03 21:00:46 +02:00
Regis Houssin
0797ff3057 Fix: missing concat 2012-09-03 17:25:35 +02:00
Regis Houssin
1abc87f642 Fix: can delete an import file with dialog confirm 2012-09-03 17:14:33 +02:00
Laurent Destailleur
9eb21c3d9f Fix: Minot miscellanous fix 2012-09-03 10:17:58 +02:00
Regis Houssin
d2ae90f938 Fix: strict mode everywhere 2012-09-02 22:48:52 +02:00
Regis Houssin
e36af3085a New: add possibility to have a confirm dialog box with on/off buttons
Qual: move some functions in lib_head.js
2012-09-02 22:18:06 +02:00
Regis Houssin
afdab32bbf Fix: avoid warnings (strict mode) 2012-09-02 22:12:56 +02:00
Regis Houssin
a00205a17d New: add possibility to set and del anothers constants 2012-09-02 22:06:03 +02:00
Regis Houssin
0ad137e734 Fix: uniformize code 2012-09-02 22:00:14 +02:00
Laurent Destailleur
2927a58606 Fix: Some fix into ajax ecm.
New: The cache for nb of files into a dir is now implemented. By
default it is "not defined" and we refresh it when making a scan of a
dir for all subdirs.
2012-09-02 20:11:36 +02:00
Laurent Destailleur
edab47fbc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-29 18:23:49 +02:00
Regis Houssin
13d46da3fe Fix: clear old data before update 2012-08-29 18:01:00 +02:00
Laurent Destailleur
86a12d7471 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-29 17:43:43 +02:00
Laurent Destailleur
d8d28d6350 New: Add ChromePHP output into syslog module. 2012-08-29 17:43:20 +02:00
Regis Houssin
327e51ccd9 Fix: more simple 2012-08-29 17:40:13 +02:00
Laurent Destailleur
87742cb3d8 Qual: Move an admin tools into admin menu.
Fix: Fix 7 bugs into the mass vat update tool.
2012-08-29 14:13:13 +02:00
Regis Houssin
54860ef304 Fix: upgrade tcpdf and fpdi 2012-08-29 09:55:32 +02:00
Regis Houssin
70c467e429 Fix: Update vat rate combobox 2012-08-29 08:17:25 +02:00
Regis Houssin
4332c341bf Fix: check if textarea is not empty for free lines 2012-08-28 12:36:35 +02:00
Laurent Destailleur
d0d5891eef New: Add unit foot2, inch2, foot3 and inch3 for surface and volumes. 2012-08-27 20:02:23 +02:00
Regis Houssin
6426ef3f8d Fix: add test for instance 2012-08-27 14:08:59 +02:00
Regis Houssin
fb866d9106 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into develop

Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_add.tpl.php
2012-08-27 13:33:31 +02:00
Regis Houssin
2f14fbe791 Fix: debug ckeditor and VAT 2012-08-27 13:27:27 +02:00
Laurent Destailleur
0bdb9aac31 Fix condition of usage of ckeditor 2012-08-27 13:07:25 +02:00
Laurent Destailleur
9570e03b1e Qual: Add TODO 2012-08-27 12:07:50 +02:00
Laurent Destailleur
d8e162c309 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-26 22:36:21 +02:00
Laurent Destailleur
bdaaa1d038 New: [ task #494 ] Send an email to foundation when a new member has
auto-subscribed
2012-08-26 22:33:27 +02:00
Regis Houssin
efa471b12b Fix: test if ckeditor is enabled 2012-08-26 21:47:56 +02:00
Laurent Destailleur
b2808f6a60 Doxygen 2012-08-26 20:18:29 +02:00
Regis Houssin
f322ec50ed New: [ task #498 ] - final part 2012-08-25 15:21:34 +02:00
Regis Houssin
d88abe8df0 Fix: use label instead libelle 2012-08-25 12:07:18 +02:00
Regis Houssin
f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
2012-08-23 07:53:48 +02:00
Regis Houssin
3cdb2ba8e1 Merge pull request #337 from marcosgdf/coding-style
Improved coding style
2012-08-22 22:43:03 -07:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +02:00
Philippe Grand
f6e31ee6bc Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-22 09:04:41 +02:00
Regis Houssin
75bfddd7a6 Fix: wrong ereg 2012-08-21 11:47:56 +02:00
Philippe Grand
6cfe58f083 fix some english translation 2012-08-21 09:39:07 +02:00
Regis Houssin
a856ad0afa Fix: strict mode sunshine 2012-08-19 09:05:50 +02:00
Regis Houssin
577a853b9b New: update field "qty" with minimum qty for this supplier price 2012-08-17 18:17:15 +02:00
Regis Houssin
7394525388 Fix: disable "add" button and show error message if a product with no
supplier price is selected
2012-08-17 16:58:57 +02:00
Stephen L
c0a314000c Add custom ODT substitution for lines of products (completesubstitutionarray_lines)
Signed-off-by: Stephen L. <lrq3000@gmail.com>
2012-08-14 16:03:45 +02:00
Laurent Destailleur
2220c6e964 Fix: Do not run request if param is empty 2012-08-08 14:07:04 +02:00
Laurent Destailleur
85f5033f47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-08 04:12:48 +02:00
Laurent Destailleur
54c6db5b81 Qual: Uniformize code for pdf generation.
Refactoring of pdf code to make code cleaner and fix a lot of bug into
page breaks.
2012-08-08 04:12:20 +02:00
Laurent Destailleur
5d9f16ca20 New: More surface control on stock correction page 2012-08-07 11:33:11 +02:00
Regis Houssin
89cd23452f Fix: missing delete shipping and delivery files
(minimum for possibility to merge with 3.2)
2012-08-05 20:41:11 +02:00
Regis Houssin
4d3e798f99 Fix: remove test in $pictoisfullpath and add test in $options 2012-08-04 14:18:02 +02:00
Regis Houssin
e955b041ca Fix: just change $path value 2012-08-04 09:56:25 +02:00
Regis Houssin
320ce03e29 Fix: optimization
see : http://mkaz.com/web-dev/php-benchmarking-isset-empty-or-var.html
2012-08-04 08:45:38 +02:00
Marcos García
189c3c94da Removed duplicated code 2012-08-04 02:15:39 +02:00
Marcos García
b8add21d93 Reversed lost changes with the previous commit 2012-08-03 23:29:08 +02:00
Regis Houssin
447fc1de1a Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-03 20:10:01 +02:00
Regis Houssin
0d96803937 Fix: strict mode tour 2012-08-03 20:09:37 +02:00
Marcos García
d30b2804bc Was using tabs instead of spaces 2012-08-03 14:31:10 +02:00
Marcos García
f700f63494 Little refactor + cpd 2012-08-03 14:30:11 +02:00
Laurent Destailleur
30d22378ac Restore img_phone as deprecated function after a patch push. 2012-08-03 13:10:15 +02:00
Laurent Destailleur
f1618bcaa7 Merge pull request #282 from marcosgdf/style
Refactor
2012-08-03 03:28:10 -07:00
Regis Houssin
fe4fc7f8dc Fix: increase speed 2012-08-02 08:02:49 +02:00
Marcos García
9d422350a5 Translated some comments 2012-07-31 14:41:15 +02:00
Marcos García
315896c702 Fixed img_up 2012-07-31 01:17:21 +02:00
Marcos García
571d20d583 Wrong behaviour 2012-07-30 23:27:12 +02:00
Marcos García
2c466159f9 Refactoring 2012-07-30 23:23:58 +02:00
Regis Houssin
66ba264ca3 Fix: strict mode and event message 2012-07-30 22:38:21 +02:00
Marcos García
0e0cf98c4f Code style improved, removed duplicated code, also removed img_phone function as it is no longer used in Dolibarr 2012-07-30 22:36:43 +02:00
Marcos García
7e0892783a Removed duplicated translation and modified a line of code as @hregis requested 2012-07-30 08:21:05 +02:00
Marcos García
be388b4418 Fixed some typos in es_ES and en_US translations
Allowed MailmanSPIP module configuration to be translated into other languages
Moved MailmanSPIP-related strings to mailmanspip.lang file
2012-07-29 22:23:51 +02:00
Laurent Destailleur
d85bd3d41c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-29 18:47:03 +02:00
Laurent Destailleur
77e4b088ac Doc 2012-07-29 18:27:53 +02:00
Regis Houssin
28851b46c4 Fix: remove duplicate code 2012-07-29 16:44:19 +02:00
Regis Houssin
0aa6694c95 Fix: broken event message 2012-07-29 15:47:24 +02:00
Laurent Destailleur
d6a5b224fb Revert bad practice: setEvent use SESSION. Such usage is limited to HTML
page context and can be used inside any pages.
However usage of _SESSION must never be used inside a library (except
for function dedicated to HTML page context), and never inside
object classes (we must use $this->errors, $this->mesgs or
$this->warnings instead).
2012-07-29 14:15:29 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Regis Houssin
9cdba5bb61 Fix: try another method more clean and can be deployed on any type of
message
2012-07-29 08:26:33 +02:00
Regis Houssin
cdc9dda11e Fix: best practice 2012-07-28 22:28:33 +02:00
Regis Houssin
a27e347ee0 Fix: for backward compatibility 2012-07-28 22:20:58 +02:00
Regis Houssin
61fc592434 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-28 22:08:05 +02:00
Regis Houssin
c7bacecf10 Fix: try to use another method for messages 2012-07-28 22:07:27 +02:00
Marcos García
16df86003d Removed space before : 2012-07-28 20:20:56 +02:00
Marcos García
8c68b096fd Removed space before : 2012-07-28 20:16:54 +02:00
Regis Houssin
251640561f Fix: strict mode happy hour 2012-07-28 12:35:11 +02:00
Regis Houssin
a157327859 Fix: strict mode paradise 2012-07-28 11:28:37 +02:00
Marcos García
2204c09e5a Applied commits 16-22 2012-07-27 23:04:05 +02:00
Laurent Destailleur
75e9d93e69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-25 12:21:04 +02:00
Laurent Destailleur
dce9b96260 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/lib/repair.lib.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-07-25 12:20:45 +02:00
Regis Houssin
7d2f7e9800 Fix: strict mode crazy 2012-07-25 11:46:33 +02:00
Laurent Destailleur
b63820c013 Checkstyle 2012-07-25 11:37:43 +02:00
Regis Houssin
e12604cb71 Fix: avoid warning and strict mode story 2012-07-25 09:09:56 +02:00
Regis Houssin
812d02ebe0 Fix: strict mode and $mesgs 2012-07-23 22:04:06 +02:00
Laurent Destailleur
66ea44886b Fix: Permissions when using web services. 2012-07-22 02:33:21 +02:00
Regis Houssin
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00
Regis Houssin
b121a01ef8 Merge pull request #247 from cbattarel/marges
Margin module
2012-07-19 10:46:24 -07:00
Laurent Destailleur
69ca9cf7d4 [ bug #445 ] Hex escaping in descriptions 2012-07-19 18:03:25 +02:00
Christophe Battarel
0cdf208f3d trigger change event when updating item value 2012-07-18 15:17:04 +02:00
Laurent Destailleur
d07e68e12f Fix: Combo list of warehouse not saved.
Fix: Validate of shipment in error
when using not predefined products.
2012-07-17 01:22:19 +02:00
simnandez
606674d8c8 Fix: Bad local taxes if price base type is TTC
Conflicts:
	htdocs/core/lib/price.lib.php
2012-07-13 15:28:25 +02:00
Regis Houssin
221ecafe07 Fix: use click2dial only for phone tel 2012-07-13 14:45:00 +02:00
Regis Houssin
77b9718473 Fix: strict mode street 2012-07-13 10:15:47 +02:00
Laurent Destailleur
ee8b80813a Fix: Date not converted correctly when using web service 2012-07-12 17:07:56 +02:00
Regis Houssin
e1b0d183e4 Fix: add commonorder and commoninvoice classes 2012-07-11 18:13:41 +02:00
Regis Houssin
e18d3c6e18 Fix: strict mode again 2012-07-11 15:55:56 +02:00
Regis Houssin
ff0668e908 Fix: strict mode way 2012-07-10 22:10:12 +02:00
Regis Houssin
28ccc43125 Fix: avoid another warning 2012-07-10 20:45:07 +02:00
Regis Houssin
4291db4a93 Fix: strict mode 2012-07-10 18:57:27 +02:00
Regis Houssin
226caf0152 Fix: and again, and again, and again... (strict mode) 2012-07-10 13:20:53 +02:00
Regis Houssin
41144643eb Fix: avoid warning php strict mode 2012-07-10 11:45:38 +02:00
Regis Houssin
41789458c5 Fix: warning again and again... 2012-07-09 18:09:44 +02:00
Regis Houssin
66b2f630ac Fix: big avoid strict mode errors 2012-07-09 12:31:21 +02:00
Regis Houssin
cd7bf41ae0 Fix: php 5.4 strict mode warning 2012-07-09 10:08:56 +02:00
Regis Houssin
887f210618 Fix: avoid warning with php 5.4 and strict mode 2012-07-08 23:22:22 +02:00
Regis Houssin
7e2469618e Change-Id: I5f8bcf59cf2fc0d902edb4d61f8c20a2880765a2 2012-07-07 12:21:09 +02:00
Regis Houssin
9fa6f43643 Fix: bad link and uniformize code 2012-07-06 10:22:37 +02:00
Regis Houssin
0bb3aced2f Fix: access problem if thirdparty module is disable 2012-07-02 20:04:28 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Regis Houssin
d593878c78 Fix: big problem with linked elements 2012-07-02 17:07:37 +02:00
Regis Houssin
761f841735 Fix: missing contract reference 2012-07-02 10:37:39 +02:00
Laurent Destailleur
2ab416889a First change to use native date functions instead of adodb 2012-06-27 10:58:51 +02:00
Laurent Destailleur
018cafe92c Fix: Add an unsecape function to decode javascript escape
encoding. This also fix ecm for cyrillic chars.
2012-06-24 19:32:19 +02:00
Laurent Destailleur
c273f9f698 Fix: escape double quotes into dol_html_escapetag
New: Passwords not reset into install page.
2012-06-17 23:27:17 +02:00
Laurent Destailleur
90bfea882a Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-16 00:08:03 +02:00
Laurent Destailleur
7e46ddd5b0 Fix: Permissions for click2dial tab 2012-06-16 00:07:24 +02:00
Laurent Destailleur
4f1d6d7328 Fix: missing a return into clean_url function 2012-06-15 11:24:09 +02:00
Laurent Destailleur
44f31bf21c Fix: The fix made by renaming PDF_ADDALSOTARGETDETAILS into MAIN_PDF_ADDALSOSOURCEDETAILS was fixing things in the wrong direction. The regression was the missing data on the recipient compared to 3.1.1 2012-06-15 11:16:17 +02:00
Laurent Destailleur
81eadcd426 Fix: Avoid warning if param is empty 2012-06-15 10:05:28 +02:00
Laurent Destailleur
c592bc88b8 Fix: Init 2012-06-15 02:17:00 +02:00
Laurent Destailleur
d8ee62101a Fix: function dol_nboflines_bis 2012-06-15 00:15:30 +02:00
Regis Houssin
1155b0097b New: add advanced rights 2012-06-14 20:11:54 +02:00
Laurent Destailleur
ec621d2dcb Fix: Bad calculation of nb of line. Fix: Bad position of lines into pdf_soleil 2012-06-14 19:58:35 +02:00
Laurent Destailleur
3fe6ed9a7d Fix: Messy source address 2012-06-14 17:50:32 +02:00
Laurent Destailleur
a1bd60a614 Fix: No call of any login method. 2012-06-14 14:08:29 +02:00
Laurent Destailleur
6cd03f9ccd Fix: typo error 2012-06-13 20:13:57 +02:00
Laurent Destailleur
a23df4f407 Qual: Removed deprecated var
New: Can add global js
2012-06-12 18:35:29 +02:00
Regis Houssin
38b0b5b39d Merge pull request #226 from defrance69/patch-5
if day of week < 7 display 2 times the day : 3 days 3 days
2012-06-11 13:05:26 -07:00
Laurent Destailleur
0739942b7e Can add more text into title shown by getNomUrl 2012-06-11 19:28:04 +02:00
Laurent Destailleur
b7abad95d8 Doxygen 2012-06-10 13:22:28 +02:00
defrance69
2540f727c0 if day of week < 7 display 2 times the day : 3 days 3 days
add the 's' if they are many days
2012-06-10 13:42:19 +03:00
Laurent Destailleur
e6cd400bc3 Qual: List of elements must be into a page called "list.php". 2012-06-09 19:16:31 +02:00
Regis Houssin
e6c6d6cf84 Fix: avoid warning 2012-06-08 18:17:03 +02:00
Regis Houssin
4d2a77a657 Fix: missing search in alternative root directory 2012-06-06 14:04:19 +02:00
Laurent Destailleur
eb3484d6b6 No need of compatibility mode 2012-06-05 12:52:25 +02:00
Laurent Destailleur
07a6ee67e2 Minor perf enhancement 2012-06-05 12:42:32 +02:00
Laurent Destailleur
14719d1b7a Compatibility mode 2012-06-05 12:34:34 +02:00
Laurent Destailleur
dadc36ad18 Fix for PHP < 5.3 2012-06-05 12:27:42 +02:00
Laurent Destailleur
b6fb117f78 Fix if tz is UTC. 2012-06-05 12:11:20 +02:00
Laurent Destailleur
61ed269044 Fix: restore broken feature. File upload/delete was ko with linux and
windows.
Note also that strisplashes should never be used anywhere in the code,
because strislashes is nor a HTML escape, nor a javascrip escape, nor a
shell or PHP escape function. If stripslashes is used somewhere, this
means there is a bug somewhere else.

upload/delete using the standard feature (not fileupload) works
correctly with that on linux/windows.
2012-06-01 10:16:42 +02:00
Regis Houssin
e9994c683a Fix: clear file name send by php 2012-06-01 07:11:00 +02:00
Regis Houssin
85e3407559 Fix: Unescape a file submitted by upload. PHP escape char " (%22) and
char ' (%27) into $FILES
Before= Capture d\'écran.doc  After= Capture d'écran.doc
2012-05-30 13:58:20 +02:00
Laurent Destailleur
c2db3265ec Fix: Regression with quot management. Try a better fix. 2012-05-30 12:43:23 +02:00
Regis Houssin
b5246add8d Fix: big problem with files upload and more compatible with external
modules
2012-05-30 00:07:06 +02:00
Laurent Destailleur
7213ae09fe Checkstyle 2012-05-29 00:08:00 +02:00
Laurent Destailleur
d52d063d98 Fix: Avoid to have a special php module. 2012-05-28 22:39:04 +02:00
Laurent Destailleur
2c21700933 Checkstyle 2012-05-25 11:54:19 +02:00
Laurent Destailleur
513413da16 Checkstyle 2012-05-25 11:53:53 +02:00
Laurent Destailleur
1fec3b56d9 Fix: Permissions to see project
Conflicts:
	htdocs/projet/fiche.php
2012-05-23 14:34:44 +02:00
Regis Houssin
01f1674231 New: add product admin page for mass conversion 2012-05-22 18:35:14 +02:00
Laurent Destailleur
e7138bce4e Fix: daylight depends also on year (not only month and day) 2012-05-15 00:48:59 +02:00
Laurent Destailleur
bd26c9e465 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-14 20:46:35 +02:00
Laurent Destailleur
4a9baa590c Fix: Bad timezone function. Daylight was not used. 2012-05-14 16:46:48 +02:00
Laurent Destailleur
89836cea29 Fix: var init 2012-05-14 01:39:59 +02:00
Laurent Destailleur
5be544264b Fix: Missing lang 2012-05-12 18:30:49 +02:00
Laurent Destailleur
64c7ae1667 Fix: hour reported is not user hour. To fix this, we show both hour
"server and user" but only if it differs.
2012-05-12 16:27:20 +02:00
Laurent Destailleur
62a1dd1912 Fix: escape html tag value 2012-05-09 18:48:16 +02:00
Laurent Destailleur
7c78c894de Fix: Not escaped html value 2012-05-09 17:44:52 +02:00
Laurent Destailleur
aa6eb25f85 Qual: Uniformize code 2012-05-09 16:40:54 +02:00
simnandez
d226534ba0 Fix:[ bug #399 ] Bad calculation of local taxes in update line products 2012-05-09 12:12:14 +02:00
Laurent Destailleur
c01fae04e4 Qual: Uniformize management of alt directories. 2012-05-08 22:49:03 +02:00
Laurent Destailleur
161846be77 Fix: [ bug #397 ] Product VAT is not coming from buying price 2012-05-08 22:10:07 +02:00
Regis Houssin
1b350fafd1 Fix: missing entity field in contract
Fix: multicompany compatibility
2012-05-03 18:42:46 +02:00
Regis Houssin
18c081a7ac New: add external theme with a module 2012-04-30 16:51:45 +02:00
Regis Houssin
73487a6aec Fix: replace mktime() by dol_now() 2012-04-30 15:01:25 +02:00
simnandez
5713a93c27 [ task #297 ] Add a installer for external modules
Adaptation to changes in dol_uncompress function. More clear and
accurate messages.
2012-04-30 12:19:11 +02:00
Laurent Destailleur
5499c91712 New: Monaco is like France for default vat calculation
Qual: More phpunit tests
2012-04-29 11:42:30 +02:00
Laurent Destailleur
7977897fd8 Fix: dol_uncompress function now works with all PHP and OS. Use PHP
native code. Only zip is supported. This is enough, modules must be zip
and only zip (tgz not more allowed).
2012-04-28 18:21:51 +02:00
Laurent Destailleur
e411852c39 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-04-28 17:01:48 +02:00
Laurent Destailleur
ff06360071 Fix: Overwritting code is not role of a template but of a module.
Code is now working as a module change. Also it is faster (no need to
make a failed include when module is not installed) and support
alternative directory.
2012-04-28 17:01:25 +02:00
Laurent Destailleur
a862b5d5c3 Fix: Try a better fix. Format of content of table should depend of
content and output rules and not on how data was input.
2012-04-28 16:58:32 +02:00
Laurent Destailleur
8ea079ed96 New: Prepare change to allow usage of print sheet for any purpose (not
only
memeber module).
Qual: Remove duplicate declaration of version.
2012-04-28 16:37:58 +02:00
Laurent Destailleur
84a0d93475 New: Can add a link or tooltip on fields into dictionnaries. 2012-04-28 14:52:53 +02:00
Regis Houssin
8cf1da4ddb Fix: mac os compatibility 2012-04-26 15:02:29 +02:00
Regis Houssin
0ad2c4a027 Fix: problem of line break between label and description when
using fckeditor
2012-04-26 10:30:18 +02:00
simnandez
25df346bd3 [ task #297 ] Add a installer for external modules 2012-04-25 16:52:35 +02:00
simnandez
5b7ff51ffc [ task #297 ] Add a installer for external modules. Init works 2012-04-25 12:41:00 +02:00
Laurent Destailleur
c42a854a87 Fix: wrong encoding of special chars 2012-04-20 14:09:30 +02:00
Laurent Destailleur
4b8eeead2c Fix: Add hidden option to restore lost feature. 2012-04-20 13:55:06 +02:00
Laurent Destailleur
658911b8c9 Qual: Move embeded style into css files. Add more styles. 2012-04-18 14:27:31 +02:00
Laurent Destailleur
220d7a2c33 Fix: eldy theme still works without css3 2012-04-17 10:27:42 +02:00