lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,390 Commits 43 Branches 150 Tags 886 MiB
f34aadef3d
Commit Graph

5016 Commits

Author SHA1 Message Date
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Regis Houssin
cb9dcfa369 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-24 17:13:39 +02:00
Regis Houssin
aa7e61178a New: add product price sharing for multicompany 2013-06-24 17:13:08 +02:00
Regis Houssin
9992bebb13 New: add product price sharing for multicompany 2013-06-24 17:12:41 +02:00
Laurent Destailleur
ec2e3db450 New: Switch cron module to status stable. Thanks to everybody to test 
this new module and debug it.
 2013-06-23 22:21:21 +02:00
Laurent Destailleur
7fb8a740e7 Fix: bad function 2013-06-23 18:54:18 +02:00
Laurent Destailleur
b49a1168e3 Fix: Use div for tables when there is a different form on each line. 2013-06-23 18:33:03 +02:00
Laurent Destailleur
0ab500d3a7 Merge pull request #1063 from grandoc/develop 
standardize code
 2013-06-21 08:10:01 -07:00
Laurent Destailleur
570275cd76 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/opensurvey.lang
	htdocs/opensurvey/public/index.php
 2013-06-21 15:37:17 +02:00
Laurent Destailleur
253ce19bc1 Fix: Bad position of field 2013-06-21 15:26:46 +02:00
Laurent Destailleur
7e748f26a6 Fix: all forms must react same way with option optimize_small_screen 2013-06-20 16:39:17 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Laurent Destailleur
f987fd2245 Fix: Inconsistency arrays into php function 2013-06-19 23:46:46 +02:00
Laurent Destailleur
7f660302e2 Fix: Inconsistency arrays into php function 2013-06-19 23:46:18 +02:00
Laurent Destailleur
ec2e4c8a8b Fix: parenthesis at wrong place 2013-06-19 22:58:35 +02:00
Laurent Destailleur
aaad4d3474 Fix: Menu cheque depends on bank module and not invoice. 2013-06-19 19:52:20 +02:00
Laurent Destailleur
5667fceba8 Merge pull request #1061 from GPCsolutions/group_concat 
Added group_concat equivalent to PgSQL
 2013-06-19 09:34:38 -07:00
Laurent Destailleur
374718f735 Merge pull request #1056 from FHenry/dev_projecthtmlform 
Continue normalizing project html.formprojet.class.php
 2013-06-19 09:32:35 -07:00
Laurent Destailleur
2a014f8c7c Merge pull request #1057 from marcosgdf/develop 
CR Fix
 2013-06-19 09:31:28 -07:00
Laurent Destailleur
b5f4c45cf0 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-19 18:14:19 +02:00
Laurent Destailleur
09317e2034 Fix: Pb with firstname/lastname and font size 2013-06-19 18:12:05 +02:00
Laurent Destailleur
0b53f72779 Fix: Pb with firstname/lastname and font size 2013-06-19 18:08:05 +02:00
Laurent Destailleur
5cb2ba3909 Several fixes in CSS 
Conflicts:
	htdocs/core/menus/standard/empty.php
 2013-06-19 17:02:09 +02:00
Laurent Destailleur
9bd41e94b5 Fix: Pb in css 2013-06-19 17:00:01 +02:00
Laurent Destailleur
850ee5e195 Several fixes in CSS 2013-06-19 16:59:03 +02:00
Raphaël Doursenaud
2f8954acb3 Added group_concat equivalent to PgSQL 2013-06-19 15:54:27 +02:00
Laurent Destailleur
51d40b94cc Fix: Pb in css 2013-06-19 15:52:06 +02:00
Marcos García
4532399026 CR Fix 
I'm getting tired of these commits...
 2013-06-19 09:26:20 +02:00
Laurent Destailleur
965b173451 Fix: hooks for leftmenu must not be loaded if left menu hidden, also 
hooks were lost into page search_page.
 2013-06-19 00:12:35 +02:00
Laurent Destailleur
bd8271ee24 Fix: hooks for leftmenu must not be loaded if left menu hidden, also 
hooks were lost into page search_page.
 2013-06-19 00:11:42 +02:00
Laurent Destailleur
c45cd3aa1c Fix: Tab must not always be visible 2013-06-18 21:44:18 +02:00
Laurent Destailleur
71b61fc1f5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/langs/fr_FR/mails.lang
	htdocs/user/logout.php
 2013-06-18 09:51:37 +02:00
Florian Henry
8a6a3fc9f4 Continue normalizing project html.formprojet.class.php 2013-06-17 14:25:33 +02:00
Laurent Destailleur
834a3fd3c5 Qual: Clean code. Removed useless functions and params 2013-06-17 14:12:59 +02:00
Laurent Destailleur
869e877cb7 Qual: We must not concat currency symbol after a price, but use the 
parameter currency of method price.
 2013-06-17 11:58:55 +02:00
Laurent Destailleur
7ec8220826 Merge pull request #1054 from marcosgdf/develop 
CR fix
 2013-06-16 15:05:28 -07:00
Laurent Destailleur
9012c49299 Perf: Optimize class loading. Need 1 MB less of memory to load home 
page.
 2013-06-16 23:15:20 +02:00
Marcos García
bf2d61515d CR fix 
Git required me to commit these changes
 2013-06-16 21:33:05 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Laurent Destailleur
c83bce262e Fix: Do not show time if start time was not calculated 2013-06-16 20:22:32 +02:00
Laurent Destailleur
91068a4476 Fix: Pb into form output 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-06-16 20:16:05 +02:00
Laurent Destailleur
0690e8c39e Fix: Pb into form output 2013-06-16 20:08:45 +02:00
Laurent Destailleur
fee958eafb Add comments 2013-06-16 12:23:00 +02:00
Florian Henry
f2e2815cc1 Merge branch 'develop' into dev_projecthtmlform 2013-06-15 11:56:45 +02:00
Florian Henry
8fb2b8fa12 Start normalize project module : create html.formprojet.class.php with 
selec_project
 2013-06-14 22:33:01 +02:00
Laurent Destailleur
3cd303c944 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-06-14 19:56:07 +02:00
Laurent Destailleur
0a9cf26a32 Fix: Bad closing of div 2013-06-14 19:51:53 +02:00
Laurent Destailleur
af8c4cd0d3 Fix: Bad closing of div 2013-06-14 19:46:43 +02:00
Laurent Destailleur
2f386b1b36 Fix: Bad closing of div 2013-06-14 19:43:45 +02:00
Laurent Destailleur
3b88142ba8 Fix: Import of extra field for members 2013-06-14 02:41:08 +02:00
Laurent Destailleur
13b3a3c850 Fix: Export of extra field for members 2013-06-14 02:35:30 +02:00
Laurent Destailleur
a9edbf4f24 Fix: Bad size of image 2013-06-14 02:25:44 +02:00
Laurent Destailleur
8ed5dfeded Fix: Bad styles of html elements 2013-06-14 02:15:43 +02:00
Laurent Destailleur
b3ca9de399 Fix: Update select with list 2013-06-14 02:09:34 +02:00
Laurent Destailleur
93c71d00f7 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/comm/mailing/cibles.php
	htdocs/core/class/hookmanager.class.php
 2013-06-12 22:17:15 +02:00
Laurent Destailleur
a50cd7b698 Fix bug into script that fix CRLF into LF 2013-06-12 11:59:55 +02:00
Laurent Destailleur
0b35217481 Start to debug/fix module IPP 2013-06-12 11:35:30 +02:00
Laurent Destailleur
0c9bc2ac5f Merge branch 'develop' of https://github.com/frederic34/dolibarr into 
frederic34-develop

Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2013-06-12 10:47:56 +02:00
Florian Henry
b4485efdeb Merge branch 'develop' into develop_926_927_928 
Conflicts:
	htdocs/core/class/extrafields.class.php

Change-Id: Ia54e1be6954bc28f81122e88e398bda8059ab536
 2013-06-11 21:41:57 +02:00
Laurent Destailleur
897d1251c8 Fix: Better fix for cleaning vars (i'm tired today) 2013-06-11 12:10:02 +02:00
Laurent Destailleur
40cd45c166 Fix: Better fix for cleaning vars 2013-06-11 12:01:12 +02:00
Laurent Destailleur
8f3ba0dacc Fix: Better fix for cleaning vars 2013-06-11 11:49:59 +02:00
Laurent Destailleur
4326bfb606 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/tr_TR/admin.lang
	htdocs/langs/tr_TR/agenda.lang
	htdocs/langs/tr_TR/banks.lang
	htdocs/langs/tr_TR/bills.lang
	htdocs/langs/tr_TR/bookmarks.lang
	htdocs/langs/tr_TR/boxes.lang
	htdocs/langs/tr_TR/cashdesk.lang
	htdocs/langs/tr_TR/categories.lang
	htdocs/langs/tr_TR/commercial.lang
	htdocs/langs/tr_TR/companies.lang
	htdocs/langs/tr_TR/compta.lang
	htdocs/langs/tr_TR/contracts.lang
	htdocs/langs/tr_TR/deliveries.lang
	htdocs/langs/tr_TR/dict.lang
	htdocs/langs/tr_TR/donations.lang
	htdocs/langs/tr_TR/ecm.lang
	htdocs/langs/tr_TR/errors.lang
	htdocs/langs/tr_TR/exports.lang
	htdocs/langs/tr_TR/externalsite.lang
	htdocs/langs/tr_TR/ftp.lang
	htdocs/langs/tr_TR/help.lang
	htdocs/langs/tr_TR/holiday.lang
	htdocs/langs/tr_TR/install.lang
	htdocs/langs/tr_TR/interventions.lang
	htdocs/langs/tr_TR/languages.lang
	htdocs/langs/tr_TR/ldap.lang
	htdocs/langs/tr_TR/mailmanspip.lang
	htdocs/langs/tr_TR/mails.lang
	htdocs/langs/tr_TR/main.lang
	htdocs/langs/tr_TR/margins.lang
	htdocs/langs/tr_TR/members.lang
	htdocs/langs/tr_TR/orders.lang
	htdocs/langs/tr_TR/oscommerce.lang
	htdocs/langs/tr_TR/other.lang
	htdocs/langs/tr_TR/paybox.lang
	htdocs/langs/tr_TR/paypal.lang
	htdocs/langs/tr_TR/products.lang
	htdocs/langs/tr_TR/projects.lang
	htdocs/langs/tr_TR/propal.lang
	htdocs/langs/tr_TR/sendings.lang
	htdocs/langs/tr_TR/shop.lang
	htdocs/langs/tr_TR/sms.lang
	htdocs/langs/tr_TR/stocks.lang
	htdocs/langs/tr_TR/suppliers.lang
	htdocs/langs/tr_TR/trips.lang
	htdocs/langs/tr_TR/users.lang
	htdocs/langs/tr_TR/withdrawals.lang
	htdocs/langs/tr_TR/workflow.lang
 2013-06-11 10:43:36 +02:00
Laurent Destailleur
5f9f709a70 Fix: vars must be cleaned for next call 2013-06-11 10:21:28 +02:00
Regis Houssin
d9f2ad4ff4 Revert "Fix: hookmanager code" 
This reverts commit 89c3cfec3a.
 2013-06-11 09:36:39 +02:00
Laurent Destailleur
1c8edb9cb5 Use currency symbol instead of text 2013-06-11 02:06:34 +02:00
Laurent Destailleur
f4fd71d1f9 Fix: Bad position of currency for USD 2013-06-11 02:05:40 +02:00
Laurent Destailleur
1f95c5d59f Revert "Fix: hookmanager code" 
This reverts commit 2bdf900db9.
 2013-06-11 00:08:15 +02:00
Regis Houssin
2bdf900db9 Fix: hookmanager code 
Conflicts:
	htdocs/core/lib/pdf.lib.php

Change-Id: I4dac5a939abdcbe60fcd1bb21465fabde1324089
 2013-06-10 19:51:07 +02:00
Regis Houssin
89c3cfec3a Fix: hookmanager code 2013-06-10 19:46:37 +02:00
Laurent Destailleur
482a771e7c Fix: Some quality fixes 2013-06-10 19:04:04 +02:00
Laurent Destailleur
48b33a7678 Merge pull request #1036 from defrance69/patch-20 
Create html.formcontract.class.php
 2013-06-10 09:06:41 -07:00
Laurent Destailleur
a925d8d535 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-10 17:01:24 +02:00
Florian Henry
9f03074127 - New: [ task #926 ] Add extrafield feature on order lines 
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
 2013-06-10 16:05:41 +02:00
Florian Henry
4f43ec0acf Add extrafield tables 2013-06-10 14:13:44 +02:00
BENKE Charles
6167fedff8 Create html.formcontract.class.php 
Add select_contract function who create à lisbox of contract
 2013-06-09 22:08:05 +03:00
Laurent Destailleur
b8f721092f Removed useless comments 2013-06-09 18:36:47 +02:00
Laurent Destailleur
0aab0cca75 Fix doxygen 2013-06-09 18:29:06 +02:00
Laurent Destailleur
88291e423f Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-09 18:24:52 +02:00
Laurent Destailleur
f78240c067 Doxygen 2013-06-09 18:24:30 +02:00
Florian Henry
4f438224d7 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-09 16:56:47 +02:00
Florian Henry
646be9b984 Fix bug on extrafeild type price and double 2013-06-09 16:56:29 +02:00
Laurent Destailleur
51d11ff190 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.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/includes/tcpdf/tcpdf.php
	htdocs/langs/el_GR/other.lang
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/main.inc.php
	test/phpunit/NumberingModulesTest.php
 2013-06-09 16:49:47 +02:00
Laurent Destailleur
49d65e5ebe Fix: criteria of select 2013-06-09 03:10:31 +02:00
Marcos García
f0454926c2 Fix bug #933: Ajax error 
Caused by commit 7e53f98
 2013-06-08 22:29:18 +02:00
Marcos García
3b28de0a07 Fixed some translation problems 2013-06-08 21:57:57 +02:00
Laurent Destailleur
5a77828e62 New: Add object_hour as substitution tag for opendocument generation. 2013-06-08 18:12:32 +02:00
Laurent Destailleur
bd4ca9f1ed Merge remote-tracking branch 'origin/3.3' into 3.4 2013-06-08 16:55:49 +02:00
Laurent Destailleur
49dcc32374 Fix: Param lang forbidden into price function 2013-06-08 16:53:26 +02:00
Laurent Destailleur
b4abe58237 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2013-06-08 16:49:02 +02:00
Laurent Destailleur
5d1dfdc7c1 Upgrade tcpdf to 6.0 2013-06-08 16:29:59 +02:00
Laurent Destailleur
2c71c898eb Fix: param lang not provided to price function 2013-06-08 15:21:47 +02:00
Laurent Destailleur
319295554d Fix: Free memory after request 2013-06-08 00:52:02 +02:00
Laurent Destailleur
9fae9da6a1 Fix: proxy was not used everywhere, timeout was not set everywhere. 2013-06-07 20:09:15 +02:00
Laurent Destailleur
c3f5e0c6ee New: Show version of client lib used by mysql drivers 2013-06-07 19:19:11 +02:00
Laurent Destailleur
421c3fb35b Fix: Bad param 'zone' into printCommon 2013-06-07 13:41:32 +02:00
Laurent Destailleur
35fbc9b066 - New: Can enable tuning info from option MAIN_SHOW_TUNING_INFO. 2013-06-07 12:43:41 +02:00
Laurent Destailleur
693f4f3b8b Fix: Pb of offset in numbering. Add also phpunit test to detect and test 
fix.

Conflicts:
	test/phpunit/NumberingModulesTest.php
 2013-06-06 21:25:10 +02:00
Laurent Destailleur
21c6d42d82 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-06 21:19:03 +02:00
Laurent Destailleur
31fe378f3b Fix: Pb of offset in numbering. Add also phpunit test to detect and test 
fix.
 2013-06-06 21:18:50 +02:00
Cédric Salvador
8ad2fad817 fixed select_thirdparty_list call in the select_company function 2013-06-06 18:31:52 +02:00
Cédric Salvador
b747b0349d merge 2013-06-06 18:31:33 +02:00
Laurent Destailleur
b7f697e8c4 Remove a call of a deprecated function 2013-06-05 22:27:02 +02:00
Laurent Destailleur
7e53f98baa Qual: Uniformize code 2013-06-05 22:01:35 +02:00
Laurent Destailleur
52407f88c4 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-05 21:59:23 +02:00
Laurent Destailleur
61d5359f23 Fix: Uniformize menu entries 2013-06-05 21:55:51 +02:00
Laurent Destailleur
e25651204c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/admin.lib.php
 2013-06-05 18:56:41 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
ebb8f05f09 Subscription to ML can also be done according to member type 2013-06-05 15:53:27 +02:00
Laurent Destailleur
eac4aa7e28 New: Module mailman can subscribe/unsubscribe to ML according to 
categories of member.
 2013-06-05 15:44:42 +02:00
Laurent Destailleur
eadfa66f2c Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/infobox.class.php
 2013-06-04 22:59:28 +02:00
Laurent Destailleur
c6c4a83850 Fix: Removed deprecated code fo local tax type 7 since we can use now 
the fiscal stamp that is a better implementation.
 2013-06-04 12:04:04 +02:00
Laurent Destailleur
22bde298de Fix: First permission must start with 1 2013-06-03 23:06:15 +02:00
Laurent Destailleur
e871ea64eb Fix: Regression 2013-06-03 19:52:34 +02:00
Laurent Destailleur
1aa5535741 New: Add function to get http content 2013-06-03 17:44:55 +02:00
Laurent Destailleur
c1dd2f20cd Qual: Clean code. 2013-06-03 15:18:36 +02:00
Laurent Destailleur
1ff175f14e Fix: Bad regex 2013-06-03 12:46:25 +02:00
Laurent Destailleur
4b3413c84c Fix: Loading of boxes from external modules 2013-06-03 12:43:14 +02:00
Laurent Destailleur
7dc984fd6f Fix: Loading of boxes from external modules 2013-06-03 11:33:13 +02:00
Laurent Destailleur
a1a8fac25c Merge remote-tracking branch 'origin/3.4' into develop 2013-06-03 11:15:15 +02:00
Laurent Destailleur
c5783215c4 Fix: Var not initialized 
Fix: Pb of duplicate run of javascript with jmobile
 2013-06-01 23:46:36 +02:00
Laurent Destailleur
8348596aea Fix: Var not initialized 
Fix: Pb of duplicate run of javascript with jmobile
 2013-06-01 23:45:03 +02:00
Laurent Destailleur
b3b80701fd Fix: Bug with jmobile 2013-06-01 02:03:19 +02:00
Laurent Destailleur
743da5a214 Fix: function to get localtax1 or 2 value from vat rate return bad value 
when countries differs.

Conflicts:
	htdocs/langs/fr_CA/main.lang
 2013-05-31 21:33:48 +02:00
Laurent Destailleur
92346296f0 Doxygen 2013-05-31 21:17:49 +02:00
Laurent Destailleur
a85fea9317 Fix: function to get localtax1 or 2 value from vat rate return bad value 
when countries differs.
 2013-05-31 21:03:24 +02:00
Laurent Destailleur
da73a8d84c Fix: syntax error 
Fix: Bad field param
 2013-05-31 16:39:34 +02:00
Laurent Destailleur
a5962a410e Fix: Bad param used 2013-05-31 16:35:32 +02:00
Laurent Destailleur
5254f102ba Fix: Solve duplicate js and solve jmobile problem of cache. 2013-05-31 16:34:02 +02:00
Laurent Destailleur
ba6d82686f Fix: Menu dictionnary 2013-05-31 14:54:10 +02:00
Laurent Destailleur
0ec32afd8d Fix: syntax error 
Fix: Bad field param
 2013-05-31 13:30:24 +02:00
Laurent Destailleur
c285f81844 Fix: Bad param used 2013-05-31 13:21:01 +02:00
Laurent Destailleur
da40c460bb Fix: Solve duplicate js and solve jmobile problem of cache. 2013-05-31 10:56:48 +02:00
simnandez
7fa0d6cffa Fix: [ bug #916 ] Same for Thirds and Members 2013-05-30 18:00:08 +02:00
simnandez
5fa2598a6f Fix: [ bug #916 ] Same for Thirds and Members 2013-05-30 17:58:48 +02:00
Laurent Destailleur
5bba5782a4 Merge remote-tracking branch 'origin/3.4' into develop 2013-05-29 21:22:27 +02:00
Laurent Destailleur
b36a10babf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-29 21:05:48 +02:00
simnandez
4f9b5883df Fix: [ bug #916 ] Products complementary attributes, imports and 
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports

No Changelog Update need, because complementary attributes is new in 3.4
 2013-05-29 18:18:24 +02:00
simnandez
00395c87a8 Fix: [ bug #916 ] Products complementary attributes, imports and 
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports

No Changelog Update need, because complementary attributes is new in 3.4
 2013-05-29 18:17:39 +02:00
Laurent Destailleur
e6c93424ce Qual: Normalized tabs 2013-05-29 15:41:59 +02:00
Laurent Destailleur
b2600e8880 Fix: Missing trans 2013-05-29 02:20:30 +02:00
Laurent Destailleur
1cb33c43bd Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/comm/action/listactions.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/agenda.lib.php
	htdocs/product/liste.php
 2013-05-29 01:30:36 +02:00
Laurent Destailleur
f8e019248d Fix: But siwtiching to auguria menu. 2013-05-29 01:24:57 +02:00
Laurent Destailleur
9ab8f4c6a3 Merge pull request #998 from FHenry/develop 
Develop
 2013-05-28 15:23:29 -07:00
Laurent Destailleur
b87350e2d6 Merge pull request #994 from defrance69/patch-13 
Update modSociete.class.php
 2013-05-28 15:09:45 -07:00
Florian Henry
8a726ab51b Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-28 21:51:11 +02:00
Florian Henry
23c25066d3 Change comment on dol_include_once 2013-05-28 17:54:55 +02:00
Florian Henry
3ddb410e2e Change comment on dol_include_once method 2013-05-28 17:53:56 +02:00
BENKE Charles
aa06a0b113 Update modSociete.class.php 
enhance filter on export of contact
add postorfunction field in export of contact
 2013-05-28 15:37:08 +02:00
Laurent Destailleur
dc7b4ebc79 Fix: But siwtiching to auguria menu. 2013-05-28 13:54:29 +02:00
Florian Henry
f543f00024 Fix PGSQL Bugs 
Removing parenthesis make query works for MySQL and PgSQL
 2013-05-26 10:34:00 +02:00
Florian Henry
56556ba222 Fix [ bug #911 ] Reorder intervention do not work 2013-05-26 10:15:43 +02:00
Laurent Destailleur
2005ce8d6e Fix: Error with jmobile 2013-05-26 05:02:46 +02:00
Laurent Destailleur
f3f4dec96e Fix: Error with jmobile 2013-05-26 05:01:28 +02:00
Laurent Destailleur
2cac1f4c9c Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2013-05-25 18:14:15 +02:00
Laurent Destailleur
7b13be4653 Merge pull request #978 from atm-maxime/3.4 
Fix : Reset every month with @99 was not working properly (for 3.4 branc...
 2013-05-25 01:59:15 -07:00
Laurent Destailleur
e8f72fd401 Merge pull request #979 from defrance69/patch-9 
Update modFournisseur.class.php
 2013-05-25 01:52:30 -07:00
Laurent Destailleur
701d8485ef Merge remote-tracking branch 'origin/3.4' into develop 2013-05-24 19:00:16 +02:00
BENKE Charles
ed67173734 Update modFournisseur.class.php 
Add filter feature on the commande export
 2013-05-24 16:17:36 +02:00
Laurent Destailleur
7bbdae239f Fix: Removed errors with not defined vars 2013-05-24 14:32:12 +02:00
Maxime Kohlhaas
f66750d5e7 Fix : Reset every month with @99 was not working properly (for 3.4 branch) 2013-05-24 11:23:56 +02:00
Maxime Kohlhaas
53c6638a90 Reset every month with @99 was not working properly. 2013-05-23 11:07:56 +02:00
Laurent Destailleur
ee84457104 Fix: not defined default value 2013-05-23 10:04:35 +02:00
Lukas Prömer
bb42f8384b Fix: 'rights' instead of 'right' 2013-05-22 16:31:50 +02:00
Lukas Prömer
f1d9a6545c Fix: 'rights' instead of 'right' 2013-05-22 14:59:21 +02:00
Laurent Destailleur
469ae91e70 Fix: regression 2013-05-22 12:02:39 +02:00
Laurent Destailleur
edf00db0e0 Merge pull request #970 from FHenry/develop 
Add generic behaviour in showphoto of html.form.class.php
 2013-05-22 02:57:21 -07:00
Laurent Destailleur
1109527528 Merge pull request #968 from FHenry/3.3 
3.3
 2013-05-22 02:56:06 -07:00
Laurent Destailleur
f21b149361 Merge pull request #969 from FHenry/3.4 
Fix bug in DDLCreateTable
 2013-05-22 02:55:26 -07:00
fhenry
40827a7ef3 Add generic behaviour in showphoto of html.form.class.php 2013-05-21 14:52:39 +02:00
fhenry
b36a16ed43 Change-Id: I2e25d4b82388f6a0fc83b97f9162a095247e3fa1 2013-05-21 14:32:30 +02:00
fhenry
13ad88832c Fix bug in DDLCreateTable 2013-05-21 14:31:39 +02:00
fhenry
f08ce6d96a Fix bug on DDLCreateDb in Mysql 2013-05-21 14:28:42 +02:00
Laurent Destailleur
12681994ea Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/fichinter/fiche.php
 2013-05-20 21:21:03 +02:00
Laurent Destailleur
71e14df62f Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-05-20 17:37:08 +02:00
Laurent Destailleur
416cdd2f9c Merge pull request #956 from cbattarel/3.3 
fix bug : external users should not see costprice and margin infos
 2013-05-20 07:39:39 -07:00
Christophe Battarel
f8ca842685 fix typo error 2013-05-20 10:10:34 +02:00
fhenry
cb182752cc Report divert bug fixing from 3.4 2013-05-19 18:47:14 +02:00
Christophe Battarel
347fc6d714 fix unauthorized access to margins for external user 2013-05-19 14:04:21 +02:00
Juanjo Menent
a7e0f8cb8e Merge pull request #958 from atm-maxime/develop 
Add mobile phone in contact export
 2013-05-19 02:54:44 -07:00
fhenry
6190dddac9 GetElmentURL fichinter instead of ficheinter (to be ok with element of 
fichinter class
 2013-05-19 11:30:35 +02:00
fhenry
181ce52223 Add ficheinter in GetElementURL for action 2013-05-18 22:17:46 +02:00
fhenry
cbf29e20a2 [ task #901 ] Add Extrafeild on Fiche Inter 2013-05-18 13:00:36 +02:00
fhenry
fefb21a56e Fix bug on Extrafield checkbox 
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
 2013-05-18 12:17:43 +02:00
simnandez
eb7254cccb Fix: Remove windows CR/LF 2013-05-18 09:19:03 +02:00
simnandez
e2f2ad30ae Fix: Remove windows CR/LF 2013-05-18 09:15:18 +02:00
simnandez
2879a09a03 Fix: Remove windows CR/LF 2013-05-18 09:11:24 +02:00
fhenry
1c1736fa20 Fix bad Warning: Bad formed request converted PGSQL 2013-05-17 19:30:48 +02:00
Maxime Kohlhaas
57212d7db8 Add mobile phone in contact export 2013-05-17 17:29:41 +02:00
Christophe Battarel
e3615d43bd fix bug : external users should not see costprice and margin infos 2013-05-17 15:02:27 +02:00
fhenry
faa2399b80 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog

Change-Id: I7abbbefde190dbe86f8cb7ae43451da9eca1c9aa
 2013-05-17 09:49:06 +02:00
Laurent Destailleur
fdd8d2cc5e Fix: to large a href 2013-05-17 01:30:39 +02:00
Laurent Destailleur
393ad1447a Qual: Uniformize permission code between viewimage.php and document.php 2013-05-16 15:46:54 +02:00
Laurent Destailleur
658f0af428 Fix: Removed warning 2013-05-16 15:13:08 +02:00
Laurent Destailleur
ad5a350073 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-16 15:06:13 +02:00
Laurent Destailleur
bae17bc39b Fix: Removed warning 2013-05-16 12:37:46 +02:00
Laurent Destailleur
fb92e13650 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	scripts/invoices/email_unpaid_invoices_to_customers.php
	scripts/invoices/email_unpaid_invoices_to_representatives.php
 2013-05-15 22:35:41 +02:00
Laurent Destailleur
ff94849b0c Fix: Security test 2013-05-15 19:57:51 +02:00
Laurent Destailleur
49735b8d39 New: Add option "filter=bank" onto script rebuild_merge_pdf.php to 
merge PDF that has one payment on a specific bank account.
 2013-05-15 17:52:56 +02:00
fhenry
721e074072 Better wulity code for Task 532 2013-05-15 14:25:33 +02:00
fhenry
be525ad0e8 Better code quality for [ task #531 ] Add a duration on tasks 2013-05-15 14:19:16 +02:00
Laurent Destailleur
b17fe9fc00 New: Export support now autosize of column for excel export. 
Fix: Bad charset when using script export-bank-receipts.
 2013-05-15 13:37:31 +02:00
Laurent Destailleur
96dc851161 Doxygen 2013-05-15 13:24:18 +02:00
Laurent Destailleur
f6dfcb756c Text cells must be left align into excel 2007 export. 2013-05-14 23:54:22 +02:00
fhenry
7de861eee4 Beteer display 2013-05-14 20:30:18 +02:00
fhenry
6727ab34ed Review style hideonsmartphone 2013-05-14 20:25:34 +02:00
fhenry
d0b4cef7a4 Change duration _planned by planned_workload 2013-05-14 20:22:33 +02:00
Regis Houssin
047aa8ea29 Fix: avoid error when multiple files uploaded 2013-05-14 15:59:47 +02:00
Regis Houssin
d2aacdb04b Fix: avoid error when multiple files uploaded 2013-05-14 15:58:59 +02:00
Regis Houssin
179fc0a4cb Fix: avoid error when multiple files uploaded 2013-05-14 15:58:20 +02:00
Laurent Destailleur
551bcba826 Fix: Try to avoid warning 2013-05-14 10:51:09 +02:00
fhenry
f98442d700 Remove the option into admin screen 2013-05-14 09:24:05 +02:00
Laurent Destailleur
ee890a87a3 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/prelevement/ligne.php
	htdocs/langs/en_US/admin.lang
 2013-05-14 01:15:05 +02:00
Laurent Destailleur
d5cc106a3a Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-14 01:04:10 +02:00
Laurent Destailleur
ea4b324e25 Merge pull request #943 from defrance69/patch-7 
Update dolgraph.class.php
 2013-05-13 15:41:36 -07:00
Laurent Destailleur
273fbdfa0e Merge pull request #942 from FHenry/3.4 
Remove warning if FetchObjectLinked call
 2013-05-13 15:38:28 -07:00
Laurent Destailleur
03cbe6e208 Fix: Can't read link with some styles 2013-05-13 23:46:37 +02:00
fhenry
760ae88f39 [ task #531 ] Add a duration on tasks 2013-05-13 17:08:36 +02:00
Laurent Destailleur
df6c796413 Fix: [ bug #889 ] Titre civilité ne s'affiche 2013-05-12 17:09:48 +02:00
fhenry
111fc3153b Fix Extrafield selllist bug in PgSQL 2013-05-12 15:45:23 +02:00
fhenry
aa7e3c2fdd [ task #892 ] Add option in thridparty customer/supplier admin to hide 
non active in select_company method
 2013-05-11 17:10:11 +02:00
fhenry
ccb60e549a Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-11 15:48:49 +02:00
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-11 15:26:24 +02:00
Laurent Destailleur
711e7bf9ad Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/adherents/fiche.php
	htdocs/core/lib/functions.lib.php
 2013-05-11 15:18:52 +02:00
Laurent Destailleur
8a90598b23 Fix: Escape entities 2013-05-11 15:12:42 +02:00
Laurent Destailleur
526a80dd20 Sec: Param not escaped 
Fix: Bad return error
 2013-05-11 15:04:17 +02:00
Laurent Destailleur
fa4fc8495b Fix: Missing translation key 
Fix: Minor css style missing
Fix: Create draft proposal return error if no contact defined.
Fix: W3C
 2013-05-11 02:12:34 +02:00
BENKE Charles
4f28c3dd41 Update dolgraph.class.php 
jflot can't manage more than 2 bars but can manage more than 3 lines.
 2013-05-11 00:13:27 +03:00
fhenry
1a7a8817be Update wrong comment 2013-05-10 18:40:19 +02:00
fhenry
0d13b8d194 Fix previous bug 2013-05-10 18:35:19 +02:00
fhenry
4bb6bd8697 Order result fetchObjectLinked by sourcetype 2013-05-10 18:23:13 +02:00
fhenry
3a05d6c641 Remove warning if FetchObjectLinked call 2013-05-10 17:50:14 +02:00
fhenry
8542a4fd28 Fix date extrafield message old datetimeformat use message in log 2013-05-10 16:34:14 +02:00
Laurent Destailleur
9b30f116f1 Fix: Some lib missing when jmobile enabled. 2013-05-10 12:48:11 +02:00
Laurent Destailleur
ce6e1dc2a6 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-09 23:35:04 +02:00
Laurent Destailleur
cc500cceba Fix: form into table is not W3C (broken with some uncommon browsers). 2013-05-09 22:39:31 +02:00
Laurent Destailleur
28c4f9af61 Merge pull request #933 from FHenry/3.4 
Make constraint SQL unique name (Mandatory for PgSQL)
 2013-05-08 00:12:54 -07:00
Laurent Destailleur
68f3a634b6 Merge pull request #932 from marcosgdf/minor 
Removed innecesary whitespace when no picto is displayed
 2013-05-08 00:11:58 -07:00
fhenry
207f6cea28 Fix [ bug #883 ] Silent pgsql errors in comm/index.php 2013-05-07 16:59:27 +02:00
fhenry
16e06736e6 Fix bug [ bug #882 ] [3.4.0] Can't open WithdrawalReceipt / fichier de 
prélèvement
 2013-05-07 16:50:27 +02:00
Regis Houssin
8836b30a02 Fix: missing rename note to note_private and add note_public 2013-05-07 14:26:51 +02:00
Regis Houssin
6ec81375c4 Fix: missing rename note to note_private and add note_public 2013-05-07 14:26:11 +02:00
Laurent Destailleur
8a82c8c5d5 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/margin/agentMargins.php
	htdocs/margin/tabs/productMargins.php
 2013-05-07 13:08:30 +02:00
simnandez
70dedc49b2 [ task #877 ] Reorganize menus. Works with auguria menu 2013-05-07 10:15:49 +02:00
Marcos García
c81cf6364a Removed innecesary whitespace when no picto is displayed 2013-05-06 22:59:50 +02:00
Juanjo Menent
3bbde9b8e4 Merge pull request #918 from FHenry/develop 
Fix margin calculation problem, and add myuser_fullname and myuser_logo
 2013-05-06 07:01:38 -07:00
fhenry
bdb81803bd Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-04 09:06:32 +02:00
simnandez
15ede98fe7 New: [ task #877 ] Reorganize menus. Init works 
Add migration script 3.4 to 3.5
 2013-05-04 01:22:09 +02:00
fhenry
95e4474906 Fix bug on PgSQL if user in on another entity than 1 2013-05-03 20:56:58 +02:00
Laurent Destailleur
1c9caeb0d3 Fix: CRLF 2013-05-03 18:33:23 +02:00
Laurent Destailleur
0b228b3a87 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/user/perms.php
 2013-05-03 18:33:05 +02:00
Laurent Destailleur
c8ef07a889 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-03 16:14:27 +02:00
Laurent Destailleur
723bd6f750 Fix: [ bug #872 ] Erreur sur page Accueil Commerciale avec pgsql 
(3.4-beta).
Fix: Permission tab was not visible for external users.
 2013-05-03 16:10:28 +02:00
fhenry
d8f1818f86 Fix margin calculation problem, and add myuser_fullname and myuser_logo 
into standard ODT replacement
 2013-05-03 15:44:35 +02:00
Laurent Destailleur
b7f3f07fc7 Fix: [ bug #840 ] fichetwothirdright 65% to 55% 2013-05-03 12:13:10 +02:00
Laurent Destailleur
880daa4375 Fix: log file permission during install 2013-05-03 11:51:26 +02:00
Laurent Destailleur
c17cd04686 Merge pull request #904 from defrance69/patch-5 
Update modSociete.class.php
 2013-05-03 01:09:37 -07:00
Laurent Destailleur
776655d8c6 Merge pull request #903 from defrance69/patch-4 
Update modProduct.class.php
 2013-05-03 01:09:29 -07:00
Laurent Destailleur
2e4c73ebc4 Fix: Link to phone with tel: must be only onto terminal that support 
protocol "tel:"
 2013-05-03 10:06:54 +02:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
fhenry
0dbc73a6cc Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d 2013-05-02 22:57:42 +02:00
Laurent Destailleur
77956a5676 Merge pull request #911 from atm-maxime/develop 
Fix : extrafields were save without escape
 2013-05-02 10:43:14 -07:00
Laurent Destailleur
f595a7ed0c Merge pull request #905 from FHenry/develop 
Add table extrafield for commande fournisseur
 2013-05-02 10:41:02 -07:00
Laurent Destailleur
9a4cc839bb Fix: Removed warning 
Fix: Parameters are lost
Fix: Hedaer of demo no complete
Fix: Get of country is not complete (bad label)
 2013-05-02 17:41:10 +02:00
Laurent Destailleur
26f3e920cf Fix: Removed warning. 
Fix: Missing doxygen
 2013-05-02 13:10:39 +02:00
Maxime Kohlhaas
80cf467c47 Fix : extrafields were save without escape 2013-05-02 12:14:29 +02:00
fhenry
5d60ed2462 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-01 22:57:33 +02:00
fhenry
3b6efd569d Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur 2013-05-01 17:09:08 +02:00
Laurent Destailleur
5c95018356 Fix: Avoid empty arrays 2013-05-01 16:00:06 +02:00
fhenry
f3480bf502 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-01 14:38:43 +02:00
Laurent Destailleur
0a71c84bf4 Fix: Remove separator files. 2013-04-30 23:08:07 +02:00
Laurent Destailleur
7d71be2227 Fix: Import of contact/address not complete and not working with pgsql 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2013-04-30 22:56:52 +02:00
Laurent Destailleur
c84427bd22 Fix: delete of files with [ and glob. 
Conflicts:
	test/phpunit/FilesLibTest.php
 2013-04-30 22:52:56 +02:00
Laurent Destailleur
786bf9d035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-30 22:39:17 +02:00
fhenry
ac6e56f058 Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur 2013-04-30 21:10:26 +02:00
Laurent Destailleur
8c064c4883 Fix: Import of contact/address not complete and not working with pgsql 2013-04-30 19:02:02 +02:00
Laurent Destailleur
761b2d05d4 Fix: delete of files with [ and glob. 2013-04-30 17:24:11 +02:00
BENKE Charles
b1784ff247 Update modSociete.class.php 
add filter feature on extrafields
 2013-04-30 13:15:02 +03:00
BENKE Charles
3f6216e6d0 Update modProduct.class.php 
Add filtering feature on extrafields
 2013-04-30 13:12:54 +03:00
Laurent Destailleur
840dcfec38 Fix: Bad detection of PDF format. 2013-04-29 09:25:42 +02:00
Laurent Destailleur
f6c2bd4928 Fix: Uniformize menu conditions 2013-04-28 23:25:28 +02:00
Grand Philippe
63c474e2cc fix: Undefined index 2013-04-28 22:29:50 +02:00
Grand Philippe
c4a064d104 fix: Undefined property: mod_codeclient_monkey::$prefixIsRequired 2013-04-28 19:35:10 +02:00
Laurent Destailleur
670d01e14e Fix: Remove space char at end of document and viewimage. 2013-04-28 18:46:34 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2013-04-28 01:24:58 +02:00
Laurent Destailleur
7b85baa5e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-28 01:12:48 +02:00
Laurent Destailleur
2e81fa342e Uniformize code, order of fiels in card and language files. 2013-04-28 01:12:40 +02:00
Laurent Destailleur
4c9a728799 Merge pull request #890 from marcosgdf/translations 
Improved translations
 2013-04-27 12:53:15 -07:00
Laurent Destailleur
07baa244ed No need to make a test on a var 2013-04-27 21:38:49 +02:00
Laurent Destailleur
38bc86dc2a Missing menu entry for home page 2013-04-27 21:37:30 +02:00
Laurent Destailleur
e29f533b7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/comm/propal/class/propal.class.php
 2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce Uniformize code for liste_array 
Fix visibility of elements into product page (manage external users)
 2013-04-27 15:08:35 +02:00
Marcos García
36574771a6 Translation of barcode internal engine string 2013-04-27 12:49:19 +02:00
Laurent Destailleur
24309a7f17 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-04-27 12:25:22 +02:00
Laurent Destailleur
3203283fe9 Fix: remove warning 2013-04-27 12:24:48 +02:00
Laurent Destailleur
50dd0ef7ee Merge pull request #885 from FHenry/develop 
Review extrafield for compliance with wiki
 2013-04-26 13:08:37 -07:00
Laurent Destailleur
0a282c018a Merge pull request #886 from jfefe/doc_ods 
Using of MAIN_DOC_USE_TIMING on ODT
 2013-04-26 13:04:08 -07:00
fhenry
91885a8bd4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-26 20:54:53 +02:00
Laurent Destailleur
162cb4ffea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-26 19:17:51 +02:00
Laurent Destailleur
2a74cb81f0 Fix: Removed warnings 2013-04-26 19:13:39 +02:00
Regis Houssin
d25687276e Fix: bypass the second test if the first is ok 2013-04-26 16:29:29 +02:00
Regis Houssin
c0a3271d76 Fix: bypass the second test if the first is ok 2013-04-26 16:28:54 +02:00
Regis Houssin
c969d17e48 Fix: avoid error 2013-04-26 16:22:14 +02:00
Regis Houssin
3684271627 Fix: avoid error 2013-04-26 16:21:48 +02:00
Regis Houssin
36e6269b24 Fix: big security problem with multicompany 2013-04-26 16:08:02 +02:00
Regis Houssin
34036c2a5c Fix: big security problem with multicompany 2013-04-26 16:07:35 +02:00
fhenry
c988944f1a PDF admin : Add option to hide num TVA intra into adress of customer 2013-04-26 13:25:51 +02:00
fhenry
30ad2f1609 Fix bug in fetch_optionals 2013-04-26 10:51:17 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
jfefe
8835868749 Implement MAIN_DOC_USE_TIMING into project and order ODT 2013-04-26 08:48:44 +02:00
jfefe
8a958c31e3 Use MAIN_DOC_USE_TIMING on invoices (odt) 2013-04-26 08:48:44 +02:00
jfefe
036e81a089 Use MAIN_DOC_USE_TIMING on proposals (ODT) 2013-04-26 08:48:44 +02:00
jfefe
bfc15fb99f Change name of hidden option to add timing in filename (MAIN_DOC_USE_TIMING) 2013-04-26 08:48:43 +02:00
fhenry
d0f44bf25f Add zero entity into extrafeild deletion 2013-04-26 08:46:25 +02:00
Laurent Destailleur
271dcf578f Fix: Better error message during import of csv with records split onto 
several lines.
 2013-04-25 23:49:24 +02:00
Laurent Destailleur
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +02:00
Laurent Destailleur
726c83d2d2 Merge pull request #877 from FHenry/develop 
Fix bug on Extrafield list table type
 2013-04-25 01:23:57 -07:00
Laurent Destailleur
023b6f2e8b Fix: Use entity 2013-04-25 10:22:08 +02:00
Laurent Destailleur
86ea79c860 Fix: dol_check_secure_access_document is also used by viewimage. This 
also solve bug of not found supplier doc and solve some security holes.
 2013-04-25 10:06:54 +02:00
Laurent Destailleur
cce857d6ee Fix: When box is removed, it is added into combo box of available boxes. 2013-04-25 01:35:33 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
fhenry
8c440b3f57 Remove entity check in list table extrafield 2013-04-25 00:14:43 +02:00
fhenry
507da4fc3b Add Zero entity to shared extrafield 2013-04-25 00:09:47 +02:00
fhenry
f1a97d4705 remove ver_export 2013-04-25 00:02:29 +02:00
fhenry
9a0f9477a6 Fix multicompany problem with extrafield list from table 2013-04-25 00:01:38 +02:00
fhenry
7fdf2f3482 Fix for php 5 2013-04-24 23:54:02 +02:00
fhenry
928a1afe18 Fix bug on Extrafield list table type 2013-04-24 21:32:22 +02:00
Laurent Destailleur
3896b99bad Add UK with GB. 2013-04-24 19:14:59 +02:00
fhenry
7b1616d0c5 Better management extrafield from list of table 2013-04-24 19:14:03 +02:00
fhenry
5789a5d6e9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 17:53:59 +02:00
simnandez
436b6259c0 Fix: finish merge 2013-04-24 16:57:46 +02:00
fhenry
9ce7e44f00 use price method rather than price2num. price are use in all PDF, so it 
should be the same on ODT
 2013-04-24 16:47:15 +02:00
Laurent Destailleur
9a2b72f8f8 Compatibility with jmobile 2013-04-24 15:49:43 +02:00
fhenry
41c8a9aa6a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 15:07:03 +02:00
Laurent Destailleur
bca399623f Fix: finish merge 2013-04-24 12:44:36 +02:00
fhenry
d9a2805100 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 08:50:51 +02:00
Laurent Destailleur
d5f3f47782 New: Use div for tabs. 2013-04-24 03:56:13 +02:00
fhenry
bd1b440743 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-23 23:28:44 +02:00
Laurent Destailleur
854b9df96d Qual: Clean code of box management 2013-04-23 16:18:26 +02:00
Laurent Destailleur
7dce8d2306 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/launchpad/README
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
 2013-04-23 14:04:56 +02:00
fhenry
ba0e9c0c19 Fix [ bug #843 ] Erreur SQL box_stock 
fix [ bug #842 ] Erreur SQL Propal
 2013-04-23 14:02:29 +02:00
Laurent Destailleur
3f1f065d4e Fix: log must use the mask defined into setup 
Conflicts:
	htdocs/core/modules/syslog/mod_syslog_file.php
 2013-04-23 12:02:56 +02:00
Laurent Destailleur
78a0c7ace2 Fix: log must use the mask defined into setup 2013-04-23 12:00:02 +02:00
Laurent Destailleur
c8b2ce3d8e Removed warning 2013-04-22 20:46:53 +02:00
Laurent Destailleur
494e9dbe18 Removed warning 2013-04-22 20:45:47 +02:00
Laurent Destailleur
9135fd0272 Merge pull request #868 from jfefe/webservices 
New webservice to retrieve a document (work on invoice, propal, order and generic
 2013-04-22 11:35:35 -07:00
Laurent Destailleur
2c4515f40e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 20:00:01 +02:00
Laurent Destailleur
5d74f228d8 Removed version into trigger page (version on trigger is useless since 
trigger depend on module. Only version of module is required).
 2013-04-22 19:59:41 +02:00
simnandez
de5a57a3c8 Fix: Uniformize creation in orders 2013-04-22 16:23:59 +02:00
fhenry
3fdc57cc56 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-22 16:20:35 +02:00
fhenry
ee4839c92e Better management for ODT to PDF 2013-04-22 15:50:26 +02:00
Regis Houssin
7217d91f13 Fix: missing commit 2013-04-22 15:26:45 +02:00
Regis Houssin
28757c8d88 Fix: missing commit 2013-04-22 15:26:14 +02:00
Regis Houssin
ccf809b14a Fix: broken features 2013-04-22 15:10:15 +02:00
Regis Houssin
29a8c10504 Fix: broken features 2013-04-22 15:09:19 +02:00
jfefe
b5e66cc492 Mutualize code for security check when accessing a document by document.php and bywebservice 2013-04-22 15:00:29 +02:00
Regis Houssin
1be6a2c120 Fix: broken features for fileupload 2013-04-22 14:39:25 +02:00
Regis Houssin
63a5aee80e Fix: broken features for fileupload 2013-04-22 14:37:18 +02:00
Laurent Destailleur
e65e6516c5 Fix: Logon theme on amarok 2013-04-22 14:33:47 +02:00
Laurent Destailleur
54040bed1d Fix: No slash alone 2013-04-22 12:48:56 +02:00
Laurent Destailleur
5cbb0359aa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 10:33:46 +02:00
Laurent Destailleur
ee843924dd Fix: Some translation change to have things more clear. 2013-04-22 10:33:06 +02:00
Regis Houssin
ab4a3dcaa7 Fix: missing rename field 2013-04-22 10:18:03 +02:00
Laurent Destailleur
89ad634230 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/langs/fr_FR/holiday.lang
 2013-04-22 01:39:49 +02:00
Laurent Destailleur
9b07271460 Merge pull request #864 from jfefe/doc_ods 
Task [#838] : Can generate ods document on thirdparty
 2013-04-21 16:32:07 -07:00
Laurent Destailleur
11023fa210 Merge pull request #857 from marcosgdf/task-823 
New: [ task #823 ] Shipping_validate email notification
 2013-04-21 16:07:37 -07:00
Laurent Destailleur
e19e0ff557 Fix: Error management 2013-04-22 00:57:56 +02:00
Laurent Destailleur
3f09cbec7e Merge pull request #855 from marcosgdf/minor-refactor 
ECM Refactor
 2013-04-21 15:18:15 -07:00
Laurent Destailleur
9f3164d710 Merge pull request #849 from GPCsolutions/ca_report_improvments 
Improved reports
 2013-04-21 15:13:34 -07:00
Laurent Destailleur
42b3d6e317 Merge pull request #865 from FHenry/develop 
Add extrafield select from table
 2013-04-21 15:12:04 -07:00
Laurent Destailleur
5893fadb58 Look: Minor style enhancement 2013-04-21 17:56:29 +02:00
fhenry
d6514e1cd6 Add extrafield select from table 2013-04-21 17:36:23 +02:00
JF FERRY
642ba10d84 New hidden option to introduce timing value into odt document nam 2013-04-21 17:04:54 +02:00
Laurent Destailleur
f4513d1beb Move option ate better place 2013-04-21 16:01:36 +02:00
JF FERRY
83028b958a Task #838 : retieve extension to work with ods document 2013-04-21 15:12:48 +02:00
JF FERRY
fcf1eeba20 Task #838 - change regex to look at ods document too 2013-04-21 14:55:32 +02:00
Marcos García
82e3a8d0b9 New: [ task #823 ] Shipping_validate email notification 2013-04-21 14:14:30 +02:00
Marcos García
293fc89a9f Missing copyright 2013-04-21 12:45:34 +02:00
Marcos García
17902a8455 Removed var_dump 2013-04-21 12:44:13 +02:00
Marcos García
7befeae371 ECM Refactor 2013-04-21 12:42:58 +02:00
Laurent Destailleur
ab2709f684 Filter on agenda event are autoselected on "manual event". 2013-04-21 12:26:44 +02:00
Laurent Destailleur
a7f169d102 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-20 23:43:19 +02:00
Laurent Destailleur
c282ff91d6 Fix: pgsql compatibility 2013-04-20 23:43:02 +02:00
Laurent Destailleur
9c11b6a246 Merge pull request #851 from FHenry/develop 
Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF
 2013-04-20 12:02:16 -07:00
Laurent Destailleur
12caa20e38 Merge pull request #850 from atm-maxime/develop 
Carrier conf modification
 2013-04-20 11:42:44 -07:00
Laurent Destailleur
4d54b8a22f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-20 20:30:48 +02:00
Laurent Destailleur
dd13c334c7 New: Compatibility with jmobile 2013-04-20 20:30:18 +02:00
Laurent Destailleur
2008fd1419 Fix: Optimize for small screen 2013-04-20 17:49:24 +02:00
fhenry
dd8a84bce3 Fix [ bug #833 ] Accounting journals are broken 2013-04-20 13:08:06 +02:00
Maxime Kohlhaas
cf945f0187 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-04-20 13:00:33 +02:00
fhenry
413ee7ec78 Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF (only if 
libreoffice/jodconverter/exec shell right)
 2013-04-20 10:44:01 +02:00
Raphaël Doursenaud
f2bd1461b2 Improved reports 
Added amount without VAT for "CREANCES-DETTES" mode
Added turnover by products/services
Added categories filter for users and products/services
Added period management
Added list sorting
 2013-04-20 07:33:10 +02:00
fhenry
62c9366d69 fix debug 2013-04-20 07:21:26 +02:00
fhenry
75194ddb57 Ifo user visibility and maxlength product label regarding db column size 2013-04-20 07:05:31 +02:00
Laurent Destailleur
162ccf68b6 Merge pull request #841 from FHenry/develop 
fix [ bug #825 ] User first name not visible into users->perms
 2013-04-19 17:21:16 -07:00
fhenry
e2d0d0d414 Fix fix as Eldy wish it 2013-04-20 00:10:20 +02:00
Maxime Kohlhaas
bfb05c78cd Change carrier config into dict instead of dedicated conf page 2013-04-19 20:20:10 +02:00
unknown
8030b39536 fix : undefined variable 2013-04-19 19:45:06 +02:00
Laurent Destailleur
eebbcbec57 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-19 19:18:39 +02:00
Laurent Destailleur
bb3f40a1bf Qual: Clean code to be able to update combo box when removing a box. 
Qual: Opensurvey tables
 2013-04-19 15:26:53 +02:00
Laurent Destailleur
08ae1d289b Pgsql compatibility 2013-04-19 15:02:53 +02:00
Laurent Destailleur
570e4391a5 Fix: Box with product out of stocks for pgsql 2013-04-19 14:51:39 +02:00
Regis Houssin
5d7b94f661 Fix: the purchase price, manually entered is not taken recovered 2013-04-19 13:30:08 +02:00
Regis Houssin
077698d789 Fix: for avoid missing the customer discount 2013-04-19 12:47:53 +02:00
Laurent Destailleur
df0b0ebf51 Fix: Uniformize pdf code for typhon. This should also solve problem 
of overlapped text into delivery receipts.

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-04-19 09:52:25 +02:00
Laurent Destailleur
5c1b3d86c3 Fix: Uniformize pdf code for typhon. This should also solve problem 
of overlapped text into delivery receipts.
 2013-04-19 09:44:37 +02:00
Laurent Destailleur
ac8868e2d2 Fix: Use correct format for js 2013-04-18 19:56:14 +02:00
Laurent Destailleur
a880a8c51e Qual: Work to prepare usage of jquery data plugins. 2013-04-18 19:37:50 +02:00
Regis Houssin
ebb09db710 Fix: for avoid errors 2013-04-18 11:05:31 +02:00
Juanjo Menent
fa4490ef79 Merge pull request #840 from FHenry/develop 
[ task #741 ] Gestion des interventions/Add intervention box
 2013-04-17 07:59:34 -07:00
Laurent Destailleur
bcacbab481 Qual: No need to use two menu entries for this. 2013-04-17 16:26:14 +02:00
fhenry
4927aae891 [ task #741 ] Gestion des interventions/Add intervention box 2013-04-17 16:20:01 +02:00
Laurent Destailleur
a5deb8e9d7 Fix: bug into is_erasable function. 
Conflicts:
	test/phpunit/NumberingModulesTest.php
 2013-04-16 15:54:36 +02:00
Laurent Destailleur
4fe49b6736 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-16 15:01:07 +02:00
Laurent Destailleur
248de05196 Fix: bug into is_erasable function. 2013-04-16 15:00:41 +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
9659ecba70 Merge pull request #836 from jfefe/extrafields 
Fix on extrafields date type : do not show current date when field not r...
 2013-04-16 02:33:01 -07:00
Laurent Destailleur
10ab1a583a Look: Optimize screens 2013-04-16 01:13:20 +02:00
Laurent Destailleur
51fe0d9e09 Removed duplicate function 2013-04-15 22:26:03 +02:00
jfefe
610fed6b3c Fix on extrafields date type : do not show current date when field not required 2013-04-15 18:42:00 +02:00
Laurent Destailleur
37e54b3d80 Qual: Update copyright files. 
Qual: Removed not used library.
Look: Uniformize css.
 2013-04-15 18:00:20 +02:00
Laurent Destailleur
8e1c06f617 Qual: Cleaner menu sources 2013-04-15 15:56:50 +02:00
fhenry
24a6321d45 Fix : Add service date limit transfert from propal to order 2013-04-15 15:55:10 +02:00
Laurent Destailleur
de2ddc02e4 Qual: Another clean of menu management system. Removed all files 
pre.inc.php
 2013-04-15 13:11:29 +02:00
Laurent Destailleur
36c55971b5 Fix: PHPUnit Regression 2013-04-14 23:57:07 +02:00
Laurent Destailleur
67052933ca Fix: PHPUnit 2013-04-14 23:42:24 +02:00
Laurent Destailleur
a0851ba99f More complete log. 2013-04-14 18:10:02 +02:00
Laurent Destailleur
e4c4cced70 Look: Optimize for small screen 2013-04-14 16:11:55 +02:00
Laurent Destailleur
a5d996de4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-14 14:45:43 +02:00
Laurent Destailleur
f8c3396fa7 Fix: "Now" button was not working when using combo calendar selector. 2013-04-14 14:45:23 +02:00
Laurent Destailleur
22402c38f8 Still working on new menu management. 2013-04-14 14:32:38 +02:00
Juanjo Menent
de19af9e9f Merge pull request #825 from FHenry/develop 
[ task #814 ] Add extrafield feature into Project/project tasks module
 2013-04-14 05:15:17 -07:00
Laurent Destailleur
3cec5bfc40 doxygen 2013-04-14 11:22:00 +02:00
Laurent Destailleur
b86eba7f34 doxygen 2013-04-14 10:50:33 +02:00
fhenry
00fb40e073 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/es_ES/admin.lang

Change-Id: I3c2c0789a92fb3d5506c717986ce0127dec75b9b
 2013-04-14 09:40:01 +02:00
Laurent Destailleur
51f444fb8c Look: Optimize title lines 2013-04-14 02:09:41 +02:00
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
 2013-04-14 01:46:33 +02:00
Laurent Destailleur
38cb9a530f Doxygen 2013-04-14 01:28:43 +02:00
Laurent Destailleur
bda39f25bf New: Default aprrover for holidays i sby default hierchical parent. 2013-04-14 01:04:11 +02:00
Laurent Destailleur
fc22489104 Fix: Option SOCIETE_DISABLE_CUSTOMERS not complete 2013-04-13 21:18:41 +02:00
Laurent Destailleur
355168527d Look: Optimize for smartphone 2013-04-13 18:41:43 +02:00
Laurent Destailleur
1a1e09a5ed Qual: Clean and mutualize code. 2013-04-13 18:33:23 +02:00
Laurent Destailleur
20c9370690 New: Support the mode readonly of ckeditor 2013-04-13 16:23:05 +02:00
Laurent Destailleur
6e495bfbe1 Fix: lang loading 2013-04-13 14:38:26 +02:00
Laurent Destailleur
90cfa42915 Fix: removed useless   2013-04-12 19:45:09 +02:00
Laurent Destailleur
62893c2ae4 Qual: uniformize code to use function de set with and height for graphs 2013-04-12 17:08:54 +02:00
Laurent Destailleur
26653a42e4 Optimize for terminal with no_mouse_hover 2013-04-12 16:53:06 +02:00
Laurent Destailleur
97b0076c5a Doxygen 2013-04-12 16:31:16 +02:00
Laurent Destailleur
ae01285fe9 Look: Replace table with div. 
Look: Optimize for smartphone
 2013-04-12 16:16:39 +02:00
Laurent Destailleur
3238a22afd Fix: Do not show not defined entries 2013-04-12 14:46:48 +02:00
Laurent Destailleur
c9b3193c44 Fix: Hooks with version 3.4 must match specification defined here: 
http://wiki.dolibarr.org/index.php/Hooks_system
So i try a better fix that implement correctly this. To have the
moveFileUpload trigger keeping dolibarr code, it must return 0.
 2013-04-12 13:18:24 +02:00
fhenry
cc497490eb [ task #814 ] Add extrafield feature into Project/project tasks module 2013-04-12 11:09:53 +02:00
Regis Houssin
9596134e47 Fix: use new method 2013-04-12 10:28:19 +02:00
Regis Houssin
0b2b888584 Fix: use new method 2013-04-12 10:26:52 +02:00
Regis Houssin
85e09a953f Fix: missing return with hook 2013-04-12 10:04:10 +02:00
Regis Houssin
3892a52852 Fix: missing return with hook 2013-04-12 10:00:20 +02:00
Laurent Destailleur
8e3f0172fc Fix: Fix tons of pb with num ref system of supplier invoices. 2013-04-12 00:00:31 +02:00
Laurent Destailleur
fe20f8ae1b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
	htdocs/install/mysql/tables/llx_expedition.key.sql
	htdocs/install/mysql/tables/llx_expedition.sql
 2013-04-11 23:08:10 +02:00
Laurent Destailleur
edcc201305 Fix: not complete renaming 2013-04-11 23:04:25 +02:00
Laurent Destailleur
4876aee493 Fix: Fix bad fix of SOCIETE_CODEFOURNISSEUR_ADDON 2013-04-11 20:32:09 +02:00
Laurent Destailleur
616219c99c Merge pull request #822 from FHenry/develop 
Qual : PHP Code_Sniffer
 2013-04-11 10:14:03 -07:00
fhenry
629ef78dc8 Add subtitution inside header and fotter document 2013-04-11 18:38:50 +02:00
fhenry
2f7be8d2c2 Add hook for substitution 2013-04-11 17:31:24 +02:00
Regis Houssin
662d9cfa6e Fix: for avoid problem with multicompany thirdparty sharing 2013-04-11 17:11:15 +02:00
Regis Houssin
9b2cbfef05 Fix: for avoid problem with multicompany thirdparty sharing 2013-04-11 17:10:11 +02:00
fhenry
6335918d72 Quel : indentation 2013-04-11 17:06:53 +02:00
fhenry
2440513007 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/opensurvey/fonctions.php
	htdocs/opensurvey/public/choix_date.php
	htdocs/opensurvey/public/create_survey.php
	htdocs/opensurvey/public/exportcsv.php
	htdocs/public/paybox/paymentko.php

Change-Id: I57468f3a0f6bb1115bd48b84517060432102c2ea
 2013-04-11 10:04:27 +02:00
Laurent Destailleur
792341a4b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
 2013-04-11 07:39:16 +02:00
BENKE Charles
e0cb09bd65 Update admin_extrafields.inc.php 
$default_value not initialised
new type : sellist
 2013-04-10 22:38:45 +03:00
Laurent Destailleur
4d0dd0d56c Fix: Function to generate pdf 2013-04-10 20:50:05 +02:00
Laurent Destailleur
9dd201df10 Fix: Log 2013-04-10 20:47:39 +02:00
Laurent Destailleur
15e86875f3 Fix: sql syntax error 2013-04-10 20:45:38 +02:00
fhenry
98ddd02a32 Qual : PHP Code_Sniffer 2013-04-10 19:55:21 +02:00
Laurent Destailleur
70b7cb1fa3 Fix: Restore suffix 2013-04-10 19:50:54 +02:00
Laurent Destailleur
a32a02e4c1 Fix: Removed warnings 2013-04-10 16:51:13 +02:00
Laurent Destailleur
d7c0cf3d50 Fix: More complete fix for emailing contact selectors. 2013-04-10 16:29:53 +02:00
Regis Houssin
19e902ef8f Fix: filter on all contacts, not just those related to a company 2013-04-10 16:00:30 +02:00
Regis Houssin
740bc2a656 Fix: filter on all contacts, not just those related to a company 2013-04-10 15:59:54 +02:00
Regis Houssin
8118332dfb Fix: security 
Conflicts:
	htdocs/core/modules/mailings/contacts2.modules.php
 2013-04-10 13:00:05 +02:00
Laurent Destailleur
ba93a4bfe2 Fix: Codesniffer 2013-04-10 12:20:45 +02:00
Regis Houssin
2c51b51a88 Fix: security 2013-04-10 11:56:19 +02:00
Laurent Destailleur
bc1469ff29 Fix: More complete function 2013-04-10 11:03:24 +02:00
Laurent Destailleur
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
Laurent Destailleur
7f6fa0bf0f Fix: Enhance detection of html 2013-04-10 10:40:35 +02:00
Laurent Destailleur
e79d0f50d0 Fix: Regression 2013-04-10 00:08:55 +02:00
Laurent Destailleur
538194f435 New: Add module opensurvey. Final. Test are welcome. 2013-04-09 23:05:50 +02:00
Laurent Destailleur
2ab5c2029d Merge pull request #817 from grandoc/develop 
add supplier invoice extrafields and some fixes
 2013-04-09 12:21:26 -07:00
frederic34
61b4305949 Merge remote-tracking branch 'upstream/develop' into develop 2013-04-09 17:33:09 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
Grand Philippe
f4e58d71ed add supplier invoice extrafields and some fixes 2013-04-09 09:38:25 +02:00
Laurent Destailleur
328801f455 Hide upload on smartphones 2013-04-09 01:27:41 +02:00
Laurent Destailleur
bba123c6ef Merge pull request #815 from FHenry/develop 
Fix bug on ODT template path for order and projects
 2013-04-08 14:27:28 -07:00
Laurent Destailleur
898a3891e8 Merge pull request #814 from grandoc/develop 
fix: wrong url
 2013-04-08 14:26:15 -07:00
Grand Philippe
5b5b57d4e0 some fixes for supplier orders extrafields 2013-04-08 23:20:35 +02:00
Laurent Destailleur
7d2b11aff5 Qual: Remove a deprecated page, replaced by a more direct combo box. 2013-04-08 19:26:45 +02:00
fhenry
6379b74099 Fix bug on ODT template path for order and projects 2013-04-08 18:02:12 +02:00
Grand Philippe
e54056b805 prepair for insert ExtraFields 2013-04-08 17:39:32 +02:00
Grand Philippe
e21e08717e normalize code 2013-04-08 16:06:57 +02:00
Grand Philippe
a593e5d4e5 fix: wrong url 2013-04-08 11:56:50 +02:00
frederic34
40f11206de Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	htdocs/commande/fiche.php
 2013-04-08 11:33:45 +02:00
fhenry
52706117d9 Merge branch 'develop' into develop_orderextrafield 2013-04-07 23:54:33 +02:00
fhenry
393007625a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I9df271d1629014299e7db131a66c1322aa897f6d
 2013-04-07 23:52:02 +02:00
Laurent Destailleur
b678183ff2 Log 2013-04-07 21:09:57 +02:00
Laurent Destailleur
5c3e6de073 Qual: Mutualize code. Only one function to build address format. 2013-04-07 17:39:08 +02:00
fhenry
78571e4458 Merge branch 'develop' into develop_orderextrafield 2013-04-07 15:12:27 +02:00
fhenry
0427080a4e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_orderextrafield

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I91fe24831dca9e1d9e6b09f85dd4b7bd37bd638e
 2013-04-07 15:11:52 +02:00
fhenry
144ab24545 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I51b110ec2c087110ab6080d1e754438ce83bd9cd
 2013-04-07 15:08:47 +02:00
Laurent Destailleur
64a9689473 Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on 
payment
 2013-04-07 14:41:42 +02:00
Laurent Destailleur
fafd426903 Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on 
payment
 2013-04-07 14:40:13 +02:00
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +02:00
Laurent Destailleur
ee2a2f7b48 Missing space 2013-04-06 16:43:26 +02:00
fhenry
2b0668bf81 Add paiement mode et delay on PDF muscadet 2013-04-06 13:38:32 +02:00
fhenry
9ff559b033 Add wished delivery date into supplier orders PDF muscadet 2013-04-06 13:06:26 +02:00
fhenry
0aba3cfc05 Fix order_supplier and invoice_supplier PDF model name 2013-04-06 13:00:41 +02:00
fhenry
cc465380da Fix upgrade bug (llx_printer_ipp) wrong syntax (my fault, sorry) 2013-04-06 12:20:19 +02:00
fhenry
b7137606ee Merge branch 'develop' into develop_orderextrafield 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: If57a2f2a386a2903b976178eb63aef2c8b09473d
 2013-04-06 10:41:29 +02:00
Laurent Destailleur
1cf2276584 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/prospect/list.php
 2013-04-05 22:59:06 +02:00
Laurent Destailleur
815bb82b0e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-05 22:51:19 +02:00
Laurent Destailleur
5f2ea4c65c Merge pull request #804 from atm-maxime/develop 
Fixes on invoice payment list and for price by quantity
 2013-04-05 13:49:52 -07:00
Laurent Destailleur
bbb0854517 Merge pull request #803 from FHenry/3.3 
Fix[ bug #774 ] Bug on creating event with box "all day" crossed
 2013-04-05 13:49:11 -07:00
Laurent Destailleur
a3c5db968e Merge pull request #800 from FHenry/develop 
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
 2013-04-05 13:39:52 -07:00
Laurent Destailleur
a5f72bfb4e Fix: Some fix after patch merge. 2013-04-05 22:38:46 +02:00
Laurent Destailleur
49c9df3688 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-05 22:29:21 +02:00
Laurent Destailleur
7ebd24daea Merge pull request #805 from zedzedtop/develop 
Develop
 2013-04-05 13:28:58 -07:00
Laurent Destailleur
b47765f721 Optimize for smartphones 2013-04-05 22:26:41 +02:00
Laurent Destailleur
1fb3159045 Qual: Uniformize code 2013-04-05 18:09:05 +02:00
Laurent Destailleur
77050340df Fix: Do not loose value dol_use_jmobile when using not connected pages 
(support and forget password)
 2013-04-05 17:50:45 +02:00
Laurent Destailleur
58277b0fff Look: Replace table with div 2013-04-05 17:39:27 +02:00
Laurent Destailleur
ff4c9c495a Fix: Uniformize field names 2013-04-05 13:35:09 +02:00
fhenry
dfcb38d13f [ task #793 ] Add extrafield feature into Orders module 2013-04-05 12:43:00 +02:00
fhenry
dcd960a957 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I2196e69ebae5a057eb6df018b683ff35f721ead9
 2013-04-05 11:46:09 +02:00
fhenry
81b34f9918 Fix Error come from [Dolibarr-dev] Errors on comm/mailing/index.php page 
mail
 2013-04-05 09:23:31 +02:00
Laurent Destailleur
d8a86453e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-04 21:15:16 +02:00
Laurent Destailleur
677fb46136 Optimize size of graph 2013-04-04 21:13:51 +02:00
Maxime Kohlhaas
9530e103e8 Fix : price by quantity now updates the discount field only if there is not an existing discount greater than the price by quantity one 2013-04-04 20:44:00 +02:00
juanjo
61b28274f7 [ bug #790 ] Spanish localtax RE not being correctly calculated 2013-04-04 16:32:06 +02:00
fhenry
c109467d20 Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse... 2013-04-04 13:58:33 +02:00
Laurent Destailleur
4996a4b217 Fix: regex not complete 2013-04-04 12:23:12 +02:00
Laurent Destailleur
281cd49f32 Merge pull request #798 from lrq3000/develop3 
Add: ODTSubstitution and ODTSubstitutionLine hooks with $odfHandler for ...
 2013-04-04 02:36:30 -07:00
Laurent Destailleur
76910d4159 Look: Start to use div to render actions buttons 2013-04-03 18:37:54 +02:00
Laurent Destailleur
545ac638b0 Qual: Removed deprecated code for using a specific mobile theme. 
New: Include terminal variables to optimize any themes.
Qual: First change to allow butAction buttons to wrap on new lines for
small size screens.
 2013-04-03 15:20:56 +02:00
Stephen L
cb3f183353 Add: ODTSubstitution and ODTSubstitutionLine hooks with $odfHandler for extended ODT substitution 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2013-04-03 00:57:40 +02:00
Laurent Destailleur
3312e620b4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-03 00:37:05 +02:00
Laurent Destailleur
08be243dc4 Optimize with smartphone 2013-04-03 00:36:31 +02:00
fhenry
9572eebae0 Check style 
(http://www.dolibarr.fr/forum/3-installation/40712-sauvegarde)
 2013-04-02 22:22:57 +02:00
fhenry
735e107a51 Better error management on extrafailed input 2013-04-02 14:12:21 +02:00
fhenry
e93b6141e1 Add translation for extrafield 2013-04-02 12:04:37 +02:00
fhenry
893fed9284 [ task #783 ] Add checkbox and radio into extrafield feature 2013-04-02 11:56:53 +02:00
fhenry
d03fb5d363 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-02 10:53:29 +02:00
fhenry
489d62dbf1 Better extrafield date management 2013-04-02 10:52:39 +02:00
Laurent Destailleur
f98e40f694 Optimize for smartphone 2013-04-02 10:26:11 +02:00
Laurent Destailleur
c8bc0a1ec9 New: Prepare to code to support jmobile. 2013-04-01 23:38:39 +02:00
Laurent Destailleur
aba9fd8fc5 Fix: Nowrap 2013-04-01 23:01:38 +02:00
Laurent Destailleur
29a1640b4c Qual: Normalize field ref_supplier into supplier invoices (replace 
facnumber).
 2013-04-01 22:39:27 +02:00
Laurent Destailleur
cf4603f5af Merge pull request #793 from jfefe/extrafields 
Task #784 : display calendar into data type extrafields / new methods to manage extrafields
 2013-04-01 12:00:08 -07:00
Laurent Destailleur
9449345395 Another step for menu management rewriting 2013-04-01 20:15:52 +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
ec52f54a52 Unique function to show input or output of extrafields datas 2013-04-01 18:59:05 +02:00
jfefe
6e66922a6b Fix : in extrafield force output for date selector 2013-04-01 18:46:53 +02:00
Laurent Destailleur
3c37f89d2e Work on new menu managers - step x 2013-04-01 16:02:16 +02:00
Laurent Destailleur
e352e4a56f New: Work on new menu management. 2013-03-31 19:54:56 +02:00
Laurent Destailleur
cc69cf7b76 New: Can defined a clicktodial setup per user 2013-03-31 16:44:24 +02:00
Laurent Destailleur
294a085047 New: ClickToDial setup is easier 2013-03-31 04:03:08 +02:00
Laurent Destailleur
dca3179bfe New: Support __LOGIN__ and __USERID__ on left menu entries 2013-03-30 21:29:14 +01:00
Laurent Destailleur
a5799b3ae8 Trans for SMS 2013-03-30 21:25:00 +01:00
Laurent Destailleur
ef571de960 New: Support __USERID__ into menu entries 2013-03-30 20:34:13 +01:00
Laurent Destailleur
4c1f17f42f Qual: More robust error management for menu description 2013-03-30 19:11:52 +01:00
jfefe
1ab1d74c77 New option (MAIN_EXTRAFIELDS_USE_TWO_COLUMS) to split extrafields display into 2 columns 2013-03-30 17:52:59 +01:00
jfefe
3fe1b26136 New method to CommonObject to display extrafields data output 
Try for product
 2013-03-30 17:43:21 +01:00
Laurent Destailleur
4208f11d87 Enhance fixutf8bomfiles and fixdosfiles tools. 2013-03-30 15:57:54 +01:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01: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
3c248ce1fe Merge pull request #790 from jfefe/extrafields 
Work on task #784 : display calendar into data type extrafields
 2013-03-30 05:27:14 -07:00
jfefe
95d8ee8b41 Revert "Show number with dot to avoid error when update extrafield" 
This reverts commit 76efc04840.
 2013-03-30 10:49:52 +01:00
jfefe
60e72a770a Merge branch 'develop' into extrafields 2013-03-29 22:25:48 +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
BENKE Charles
701814ad19 Update mysqli.class.php 2013-03-29 21:19:22 +01:00
Laurent Destailleur
e40909144d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-29 18:30:05 +01:00
Laurent Destailleur
97a90b0904 New: Add more ODT tags 2013-03-29 16:45:40 +01:00
Laurent Destailleur
ff5b2b3404 Merge pull request #786 from defrance69/patch-21 
Update mysql.class.php
 2013-03-29 08:32:17 -07:00
Laurent Destailleur
4c47393b51 Fix: Add more ODT tags 2013-03-29 16:18:55 +01:00
Laurent Destailleur
8f331adff6 New: Work on men management rewrite 2013-03-29 16:16:26 +01:00
Laurent Destailleur
006050b6cd Fix: left menu not always opened 2013-03-29 15:39:35 +01:00
jfefe
1a1aebf793 Display date extrafield with correct format 2013-03-29 14:56:31 +01:00
jfefe
80f080f5a9 Format date for sql query 
Using dol_print_date because db->idate doesn't work
 2013-03-29 14:45:40 +01:00
jfefe
c53564c454 For extrafield with date type show calendar instead basic input field 2013-03-29 14:03:39 +01:00
jfefe
520e235207 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 2013-03-29 10:44:35 +01:00
BENKE Charles
d5a1f64e76 Update mysql.class.php 
some other problems about DDLCreateTable, other field setting not actived
 2013-03-29 02:09:19 +01:00
Laurent Destailleur
2e3fd0083a Merge pull request #785 from FHenry/develop 
Add more information in ODT project template
 2013-03-28 15:40:46 -07:00
fhenry
c2be118efd Add more information in ODT project template 2013-03-28 20:51:00 +01:00
Laurent Destailleur
8ad801d0b6 Merge pull request #784 from jfefe/extra_error 
Better error management when add/update extrafields
 2013-03-28 11:12:58 -07:00
Laurent Destailleur
4e97a41612 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-28 16:29:22 +01:00
jfefe
ed2b359dae Bad parameter when calling setEventMessage function 2013-03-28 06:48:21 +01:00
Laurent Destailleur
07062065e5 Merge pull request #782 from jfefe/propal_odt_choice 
New : can choose to generate the ODT document according to the status of a propale
 2013-03-27 13:35:34 -07:00
jfefe
013eac1147 Better error management when add/update extrafield 
Usage of setEventMessage() function
 2013-03-27 21:24:45 +01:00
Laurent Destailleur
753bfdbec2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-27 20:43:43 +01:00
Laurent Destailleur
0a3b7e7994 New: Be able to get path of image without tag img 2013-03-27 20:43:28 +01:00
Regis Houssin
55757a6b82 Fix: $i is global 2013-03-27 20:42:55 +01:00
jfefe
0b7d13d463 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 2013-03-27 20:39:56 +01:00
jfefe
1f537300ea Add hidden option MAIN_PROPAL_CHOOSE_ODT_DOCUMENT to enable choice of ODT document to use according to his status 2013-03-27 19:11:42 +01:00
Laurent Destailleur
f27f601a73 Merge pull request #780 from FHenry/develop 
Add information on Project ODT into ODT project
 2013-03-27 07:56:33 -07:00
jfefe
ee52e1a487 Merge remote-tracking branch 'upstream/develop' into propal_odt_choice 2013-03-27 15:25:13 +01:00
Laurent Destailleur
a22d39adfb Fix: Hook is a replaceadd hook. 2013-03-27 14:11:15 +01:00
fhenry
9507f4258b Add inforamtion on Project into ODT project 2013-03-26 23:32:22 +01:00
Regis Houssin
e75c609a0a Fix: wrong var name 2013-03-26 18:33:44 +01:00
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
61826b04d8 Fix: broken feature for use hooks with dol_move_uploaded_file method 2013-03-26 18:33:06 +01:00
Regis Houssin
a701cbd77c Fix: wrong var name 2013-03-26 17:47:37 +01:00
Laurent Destailleur
b694451ab2 Use engine instead of type 2013-03-26 17:45:07 +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
Regis Houssin
33a82c396e Fix: broken feature for use hooks with dol_move_uploaded_file method 2013-03-26 17:12:00 +01:00
BENKE Charles
2c56a1c8dc Update mysql.class.php 
Create Table 'type' not supported on recent mysql databases, need to use 'engine' instead
 2013-03-26 16:49:02 +01:00
frederic34
1cd39df82b Merge remote-tracking branch 'upstream/develop' into develop 2013-03-26 10:24:46 +01:00
frederic34
4c29eaecd1 Print IPP 2013-03-26 10:23:00 +01:00
Sébastien de Chateauvieux
28999af70b TVA NPR : set function get_default_npr 2013-03-26 08:47:17 +04:00
Laurent Destailleur
55a9d3abf1 Merge pull request #776 from FHenry/develop 
[ task #770 ] Add ODT document generation for Projects module
 2013-03-25 15:52:30 -07:00
fhenry
9dd4ed9cb8 [ task #770 ] Add ODT document generation for Projects module 2013-03-25 19:28:34 +01:00
BENKE Charles
8b160ac712 Update modAgenda.class.php 
Add export feature of calendar module
 2013-03-25 18:26:35 +01:00
Laurent Destailleur
6a34250712 Rewrite module manager. Next step. 2013-03-25 17:54:54 +01:00
fhenry
7881502b52 [ task #773 ] Add Project document in GED(ECM) modules 2013-03-25 09:56:07 +01: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
b3d4811b6f New: Another method to allow style tags into email. 
Preivous one was using encoding, but this create data to not be stored
correctly into database. Old method is still available by adding
'_encoded' at end of toolbar name.
 2013-03-24 19:00:58 +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
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
Grand Philippe
8f7c629d9c prepair numbering models for supplier invoices 2013-03-15 17:45:25 +01:00
Laurent Destailleur
7a152c8e0b Prepare code to be compatible when we will store localtax_type into 
lines.
 2013-03-15 17:29:18 +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
1a62cdfbe8 Fix: Use better test to show localtax to avoid problem when switching 
from different country.
 2013-03-15 17:06:42 +01:00
Grand Philippe
a9eed57e27 prepair numbering models for supplier invoices 2013-03-15 16:43:28 +01:00
simnandez
c0e5cacafc Fix: Bad orders list viewstatut filter if expeditons module is disabled 2013-03-15 16:18:14 +01:00
Grand Philippe
b0bce23595 prepair numbering models for supplier invoices 2013-03-15 16:16:38 +01:00
Raphaël Doursenaud
16efed11ca Added natural search to product line search 2013-03-15 16:05:49 +01:00
Grand Philippe
3c7c5f262f anglicization of comments 2013-03-15 16:03:03 +01:00
Laurent Destailleur
a86c6ac39d New: price function can show price with currency symbol. 2013-03-15 15:59:51 +01:00
Laurent Destailleur
b6a30bb748 Merge pull request #742 from grandoc/develop 
change birth instead of naiss
 2013-03-15 04:05:18 -07: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
philippe
a71ffc0839 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-03-14 08:22:08 +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
Grand Philippe
e1baf806b9 change birth instead of naiss 2013-03-13 22:17:03 +01:00
jfefe
76efc04840 Show number with dot to avoid error when update extrafield 2013-03-13 22:01:34 +01:00
Laurent Destailleur
277784af25 New: Start to work on a cron module 2013-03-13 19:55:21 +01:00
Laurent Destailleur
80b5bd7215 Comment 2013-03-13 19:14:49 +01:00
Laurent Destailleur
ed5d1196b2 Fix: no link if user unknown 2013-03-13 17:34:54 +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
4db666824f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-12 16:13:56 +01:00
Laurent Destailleur
390921512c Move info message on top right 2013-03-12 15:56:47 +01:00
Laurent Destailleur
854cd5dbe3 Merge pull request #736 from simnandez/develop 
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc. Supplier order
 2013-03-12 07:31:04 -07:00
simnandez
8114249fca [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 
Supplier order
 2013-03-12 15:06:38 +01:00
frederic34
33e6654454 print ipp 2013-03-12 01:06:49 +01:00
frederic34
9c8a9ff7dc Print IPP 2013-03-11 23:35:31 +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
0219f11e64 Fix: Missing default value 2013-03-11 17:01:46 +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
633a15f10d Fix: Usage of order into export broken when filters are used 2013-03-11 14:20:08 +01:00
Laurent Destailleur
5eb728ae43 Fix: Usage of order into export broken when filters are used 2013-03-11 14:09:54 +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
9b8a8351b4 Fix: Menu hidden 2013-03-10 13:22:51 +01:00
Laurent Destailleur
746e005726 Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
Laurent Destailleur
60f16e1a88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-09 19:06:53 +01:00
Laurent Destailleur
3e5ee3b00a Fix: PHPUnit tests are back. 2013-03-09 18:55:57 +01:00
Laurent Destailleur
e03487f865 Merge pull request #724 from KreizIT/develop 
Add trigger BILL_UNVALIDATE when invoice is unvalidate
 2013-03-09 09:55:29 -08:00
Cedric GROSS
d16691c856 Add trigger BILL_UNVALIDATE when invoice is unvalidate 2013-03-09 17:38:35 +01:00
Laurent Destailleur
00f4e6ad85 Fix: Force format text of excel text fields 2013-03-09 16:58:55 +01:00
Laurent Destailleur
418eeef8b4 Fix: Ton of bugs into renaming fields 2013-03-09 16:19:15 +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
18ff2fd198 Merge remote-tracking branch 'upstream/develop' into develop 2013-03-08 13:30:44 +01:00
Laurent Destailleur
e5f712fe14 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-08 12:09:49 +01:00
Laurent Destailleur
2a67af3c94 New: when adding an action, we can define a free code to tag it for 
a specific need.
 2013-03-08 12:04:01 +01:00
frederic34
135de9ecdb Print IPP 2013-03-08 11:54:32 +01:00
frederic34
2e03169acd Print IPP icon display in formfile 2013-03-08 11:47:48 +01:00
frederic34
cdb1242bb5 Print IPP fix and printer icon 2013-03-08 11:38:30 +01:00
frederic34
16c5427366 Print IPP 2013-03-08 11:26:05 +01:00
Laurent Destailleur
1e5c56642c Fix: Some regression after renaming state and lastname. 2013-03-08 02:49:42 +01:00
Laurent Destailleur
c86f3ef4b4 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2013-03-08 01:57:32 +01:00
Laurent Destailleur
44698fcde0 Fix: dol_is_dir may not be loaded, so call fails 2013-03-08 01:53:41 +01:00
Laurent Destailleur
b060e5961b Qual: Another step in men manager rewrite. 2013-03-07 19:47:03 +01:00
Laurent Destailleur
e97ca67c4a Fix: Several problem with localtax into PDF generation 
Conflicts:
	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/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2013-03-07 19:13:50 +01:00
Laurent Destailleur
c762c93eb1 Fix: Several problem with localtax into PDF generation 2013-03-07 12:04:12 +01:00
Laurent Destailleur
3defd294cb Merge remote-tracking branch 'origin/3.3' into develop 2013-03-07 11:08:15 +01:00
jfefe
fcd81e47eb Use price2num() function instead of price() to use calcul in ODT. 
Libre/Open Office wants number with dot and no space to allow make calcul in ODT document
 2013-03-07 03:43:23 +01:00
jfefe
289e2e7888 New function to fill ODT substitution array with extrafield of object 2013-03-07 03:27:28 +01:00
jfefe
65ed01a251 Extrafields on ODT (propal) : fix value of price with currency & display date with correct format 2013-03-07 03:27:20 +01:00
jfefe
ac3116930c Add value to store price type extrafield without currency in ODT 2013-03-07 03:27:08 +01:00
jfefe
06807ce198 Fix : select correct value of extrafield (select list) 2013-03-07 02:13:21 +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
eldy
6c2841d4d6 New: Type of fields are received by export format handlers 2013-03-06 22:28:15 +01:00
eldy
e74b07cbff Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-03-06 21:28:50 +01:00
jfefe
04617d0eb3 Show extrafields for object into invoice ODT document 2013-03-06 05:33:00 +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
jfefe
55bfdd341d Fix : change to variable with unused name 2013-03-05 23:51:42 +01:00
jfefe
bd229a9417 Add param to define key name in return array of substitution function 
for propal
 2013-03-05 22:23:57 +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
c11f7dfc71 Next step for rewriting menu managers. 2013-03-05 15:42:26 +01:00
jfefe
5ce11d00dd Display linked propal information into invoice ODT 2013-03-05 15:11:51 +01:00
Laurent Destailleur
de6d40237d Fix: No syntax error when when want no limit 2013-03-05 13:28:31 +01:00
JF FERRY
ff2a851ae8 Move substitution function for propal to common class & add extrafields display 2013-03-05 08:38:41 +01:00
Laurent Destailleur
215731dc59 Fix bug 2013-03-05 00:14:04 +01:00
Laurent Destailleur
b036120c70 Labels 2013-03-04 23:56:17 +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
fhenry
c29602382d Taking account remark on pull request da17302 2013-03-04 16:59:39 +01:00
fhenry
da17302349 [ task #743 ] GED : Add aministration option to disabled autotree to 
display
 2013-03-04 11:16:46 +01:00
fhenry
b0212fc8e6 Fix [ bug #742 ] 
and translation of constant description
 2013-03-03 21:23:18 +01:00
simnandez
a811121daf [ task #731 ] Uniformize ref generation 2013-03-02 16:50:36 +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
eldy
4e52b2596a Uniformize code 2013-02-28 23:49:38 +01:00
Regis Houssin
16ad99f8c5 Fix: to force id field name 2013-02-28 19:41:44 +01:00
Regis Houssin
d9b7886ef9 Fix: try to fix regression, stored the last id created in a session 
variable in order to be used to find out information in the "ref_ext" in
order to differentiate automatic actions.
 2013-02-28 18:47:38 +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
Laurent Destailleur
fd6b51413c Civility not required in a short label 2013-02-28 15:37:53 +01:00
Laurent Destailleur
33feddcd32 Qual: Rewrite of menu manager. next step. 2013-02-27 21:40:43 +01:00
Laurent Destailleur
bdcb6bdef5 Try to aplpy enhancements defined into 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/38958-resolu-probleme-exports#38968
 2013-02-26 20:15:20 +01:00
Laurent Destailleur
402fe2e417 Merge remote-tracking branch 'origin/3.3' into develop 2013-02-26 20:05:23 +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
Laurent Destailleur
43a248b88b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2013-02-25 13:01:56 +01:00
Laurent Destailleur
2dc4b91521 New: Function plimit of databases drivers accept -1 as value (it means 
default value set into conf->liste_limit).
 2013-02-25 12:51:38 +01:00
Maxime Kohlhaas
428f844b4d LDAP : add option to get data as an array 2013-02-25 11:57:52 +01:00
Maxime Kohlhaas
cfa1a41a16 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-02-25 11:54:26 +01:00
Laurent Destailleur
b9ead08968 Merge pull request #691 from grandoc/develop 
english language standardization
 2013-02-25 01:32:26 -08:00
Laurent Destailleur
e748f07806 Qual: Using divs instead of tables 2013-02-25 10:31:47 +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
6decab1847 english language standardization 2013-02-25 09:17:38 +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
b61c576343 Qual: Still work onto menu management rewrite. 2013-02-24 21:16:36 +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
24eab5b8fd New: Add page with seach only boxes. 2013-02-24 18:22:28 +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
Laurent Destailleur
3baf8a6c00 New: Use div instead of tables into login page. 2013-02-24 14:57:49 +01:00
Laurent Destailleur
6b20370ffa Fix: Check consitency of option NOREQUIREXXX 2013-02-24 14:54:08 +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
9175f241ff Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-24 10:10:52 +01:00
Laurent Destailleur
08bde6faa5 Fix: Do not load menu when not required. 2013-02-24 03:45:19 +01:00
Laurent Destailleur
50de5a944a Fix: compatibility with new menu manager 2013-02-24 03:29:03 +01:00
Laurent Destailleur
d3c2d088a9 New: Add url to get menu only. Work on progress. 2013-02-24 02:55:25 +01:00
Laurent Destailleur
cd56fa61e6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-24 02:47:47 +01:00
Laurent Destailleur
d786e8ca6e Code comment 2013-02-24 02:42:37 +01:00
Laurent Destailleur
c62f87380c Qual: use div instead of table 2013-02-24 02:41:46 +01:00
Grand Philippe
6adc9eb7f2 english language standardization 2013-02-23 17:40:28 +01:00
Grand Philippe
c9f91a6082 english language standardization 2013-02-23 17:01:10 +01:00
Laurent Destailleur
4dbf5a20ad Merge pull request #687 from frederic34/develop 
WIP : Admin for Carriers
 2013-02-23 07:38:55 -08:00
Grand Philippe
ac0e99bc1a english language standardization 2013-02-23 16:21:49 +01:00
Grand Philippe
f862adc4d9 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-23 15:27:06 +01:00
frederic34
9333fdb97f WIP : Admin for Carriers 2013-02-23 15:23:33 +01:00
Grand Philippe
37cce5d860 fix: change name with lastname 2013-02-23 14:31:59 +01:00
Grand Philippe
7c2a4500d6 fix: change name with lastname 2013-02-23 12:30:01 +01:00
Laurent Destailleur
37b94e43c8 Merge pull request #685 from frederic34/develop 
WIP : Admin for Carriers
 2013-02-23 03:11:52 -08:00
Laurent Destailleur
bbe145cc47 Merge pull request #681 from grandoc/develop 
english standardization
 2013-02-23 03:08:56 -08:00
Laurent Destailleur
845e4ff93d Merge pull request #684 from jfefe/develop 
Fix bug #732 : Missing argument when calling selectcontacts method
 2013-02-23 02:55:46 -08:00
Grand Philippe
182fdbce32 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-23 10:04:31 +01:00
Laurent Destailleur
1224e79ee3 Qual: Start to clean how menu managers works. 2013-02-22 19:16:03 +01:00
Grand Philippe
a0df6764d8 english standardization 2013-02-22 17:13:11 +01:00
Grand Philippe
844433d0a2 english standardization 2013-02-22 17:11:53 +01:00
jfefe
34bfdf92cd Fix bug #732 : Missing argument when calling selectcontacts method 2013-02-22 15:34:20 +01:00
Maxime Kohlhaas
04e1be4afd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-02-22 15:24:49 +01:00
Maxime Kohlhaas
87dc3a0b22 LDAP sync : trigger was launched even if LDAP_SYNCHRO_ACTIVE is 'ldap2dolibarr' 2013-02-22 15:24:29 +01:00
fhenry
af6bb94ff3 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-02-22 15:02:33 +01:00
fhenry
44b5b98308 Fix [ bug #733 ] 2013-02-22 15:02:06 +01:00
Laurent Destailleur
8c4e13230b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 14:20:46 +01:00
philippe
b4e43bbc41 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 13:58:19 +01:00
Regis Houssin
b5d2a378fa Fix: pdf models are unstable and time consuming. 2013-02-22 13:14:54 +01:00
Regis Houssin
7d0f02eb8b Fix: pdf models are unstable and time consuming. 2013-02-22 13:14:04 +01:00
Laurent Destailleur
a1b05f8be4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 13:02:15 +01:00
Regis Houssin
8a5f68de9c Fix: wrong hidden 2013-02-22 12:22:28 +01:00
Regis Houssin
dd7411593e Fix: wrong hidden 2013-02-22 12:21:49 +01:00
Laurent Destailleur
327f4062c7 New: Prepare code to be able to choose bank account to show when 
building pdf and payment mode is withdraw.
 2013-02-22 12:04:38 +01:00
philippe
fae9f73ea4 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-22 11:31:52 +01:00
Regis Houssin
3b45cffafa Fix: hide blocs with multi-page 2013-02-22 11:26:23 +01:00
Regis Houssin
8136244d87 Fix: hide blocs with multi-page 2013-02-22 11:25:29 +01:00
Regis Houssin
20522148f2 Fix: regression, the product discount overwrites the default customer 
discount !
 2013-02-22 11:06:45 +01:00
Regis Houssin
289ff4fe1a Fix: regression, the product discount overwrites the default customer 
discount !
 2013-02-22 11:03:20 +01:00
Grand Philippe
d229d3a594 english standardization 2013-02-22 09:41:56 +01:00
frederic34
de4bc7f39d Fix : It was a bad idea to add COL in the code name of new carriers 2013-02-22 08:56:14 +01:00
frederic34
6259f4ce59 Fix : some & -> &amp; 2013-02-21 23:08:58 +01:00
Laurent Destailleur
0aa24369fd Merge pull request #676 from frederic34/develop 
New: Add some carrier
 2013-02-21 12:44:30 -08:00
Laurent Destailleur
c24b29343a Merge pull request #674 from simnandez/develop 
Qual: Try to delete no more used addpropal.php
 2013-02-21 12:39:47 -08:00
eldy
3d80a6ebfc Fix: Enhance pgsql driver 2013-02-21 21:04:20 +01:00
simnandez
5d357c7736 Trad: Fix activity box translation 2013-02-21 18:48:56 +01:00
frederic34
d7f83c3520 New: Add some carrier 2013-02-21 11:23:12 +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
Laurent Destailleur
2017815e89 Fix: Works for both normalized modules and external modules 2013-02-20 17:34:03 +01:00
Laurent Destailleur
1aee361ffd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-20 14:58:56 +01:00
Laurent Destailleur
f194ee5363 Fix: core dir of external modules must be into dir of module. 2013-02-20 14:58:40 +01:00
Laurent Destailleur
e5e4c113a3 Merge pull request #672 from jfefe/extrafields 
Fix : extrafields value in ODT document
 2013-02-20 03:05:54 -08: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
3912013a05 Merge pull request #668 from FHenry/develop 
Better to use foreach because when add mail in $cible array we can test
 2013-02-19 01:14:23 -08:00
fhenry
3e42f90b1e Better to use foreach because when add mail in $cible array we can test 
with (!array_key_exists($obj->email, $cibles)) better than old method
 2013-02-19 04:48:39 +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
jfefe
a197e6a026 Merge branch 'extra_odt' into extrafields 2013-02-18 15:50:47 +01:00
jfefe
110713f6ca Fix : display correct value in ODT for extrafields 2013-02-18 15:47:40 +01:00
fhenry
195af1f2bd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-18 15:25:27 +01: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
jfefe
2f4a80215b Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 2013-02-18 13:39:00 +01:00
jfefe
fe57b513f8 Merge branch 'extra_odt' into extrafields 2013-02-18 00:58:54 +01:00
jfefe
71a2b4c8c0 In ODT document add currency symbol with extrafields of type "price" 2013-02-18 00:58:40 +01:00
jfefe
3ef8c6e5dd Missing variable declaration 2013-02-18 00:40:49 +01:00
fhenry
3694031053 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-17 21:41:27 +01:00
jfefe
8ebb48cb5c Fix : in ODT show value and not label of company extrafield 2013-02-17 21:28:00 +01:00
jfefe
060060f08b Missing object $langs when showing extrafield of type 'price' 2013-02-17 21:27:48 +01:00
jfefe
16e9f6db48 Fix : bad name of property when retrieve extrafields for thirdparty 2013-02-17 21:27:33 +01:00
jfefe
527beab671 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extra_odt 2013-02-17 21:26:56 +01:00
Laurent Destailleur
249a03dd57 Merge pull request #659 from jfefe/extrafields 
Work on extrafields
 2013-02-16 14:19:24 -08:00
Laurent Destailleur
2ea62073b6 Merge pull request #660 from grandoc/develop 
fix : doesn't work with a /
 2013-02-16 14:14:30 -08:00
Laurent Destailleur
50decdd941 Fix: When creating user on other entity, no way to read user 
after creation.
 2013-02-16 21:06:15 +01:00
jfefe
fa53147d0a Retrieve extrafields when fetch thirparty 
Work on extrafields support in thirpdparty ODT document
 2013-02-16 03:41:11 +01:00
Grand Philippe
ab2b06117b fix trad : change adresse versus address 2013-02-15 19:56:51 +01:00
Grand Philippe
2bfd6c40d0 fix trad : change adresse versus address 2013-02-15 19:26:09 +01:00
Laurent Destailleur
b1ee14ce60 New: Can define a hierarchical responsible on users. 2013-02-15 18:39:27 +01:00
Grand Philippe
7c47dedbce fix trad: begin change address instead of adresse 2013-02-15 17:33:07 +01:00
Laurent Destailleur
e0bbb78f56 Fix: Merge customer and prospect tab 2013-02-15 17:28:07 +01:00
Laurent Destailleur
7260f39d21 New: Support tag total_vat_x.y for vat rate x.y into ODT templates 2013-02-15 17:06:32 +01:00
Grand Philippe
7c1a4e6fdf fix trad to get better understanding 2013-02-15 15:48:53 +01:00
jfefe
3d8197ce4b Work on extrafields : position management & new type : select list 2013-02-15 11:19:49 +01:00
jfefe
14f21bc9f1 Add select list in extrafields type 2013-02-15 00:17:42 +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
Laurent Destailleur
91215a075a Merge pull request #653 from atm-maxime/develop 
Set draft function
 2013-02-13 08:54:57 -08:00
Laurent Destailleur
7d1c51ab77 Add option MAIN_PDF_TITLE_BACKGROUND_COLOR 2013-02-13 16:45:53 +01:00