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

5131 Commits

Author SHA1 Message Date
Grand Philippe
71a9e148b3 fix : warning during install 2013-08-24 11:34:34 +02:00
Juanjo Menent
376b2812fe Merge pull request #1190 from altairis-fr/develop 
add ability to modify margin rate on line edit if authorized
 2013-08-23 00:18:08 -07:00
Laurent Destailleur
9da5f7f47a Qual: Doxygen 2013-08-22 16:49:23 +02:00
Laurent Destailleur
c1dae58055 Fix: Bad translation (to pick to 3.4) 2013-08-22 12:46:10 +02:00
Christophe Battarel
4df216afbc add ability to define margin when adding line with new experimental form 2013-08-22 12:13:14 +02:00
Christophe Battarel
f37c24f8ff allow to modify margin rate or mark rate but not both 2013-08-22 11:45:27 +02:00
Christophe Battarel
e672783adb add ability to modify margin rate on line edit if authorized 2013-08-22 11:39:55 +02:00
lalaina rasamoelina
8a4041e534 T975-develop Add an element (statut) in the table llx_socpeople 
It's used to mark if the contact is gone or no(we can activate or desactivate the contact with this)
And if the contact is gone,we don't print her mail in the mail list,where we can send a mail
 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
1295c8d27b Put the status of contact in the list of contact 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
dc3ccf6373 Style of page 2013-08-22 11:04:06 +02:00
lalaina rasamoelina
5ed186e178 Delete the contact who are gone,in the email list 2013-08-22 11:04:06 +02:00
Laurent Destailleur
05040d1997 Fix: B1032-develop: Problem in the filter of Contact by company category 2013-08-21 22:42:08 +02:00
Laurent Destailleur
f0dee93f78 Fix: B1032-develop: Problem in the filter of Contact by company category 2013-08-21 22:34:13 +02:00
Laurent Destailleur
52d39915d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-21 22:21:33 +02:00
Laurent Destailleur
ea4ac30b28 Fix: more responsive box 2013-08-21 21:39:39 +02:00
Laurent Destailleur
327aa80ed0 Fix: Error management 
New: Autoselect category in list if there is only one element in list.
 2013-08-21 13:02:33 +02:00
Laurent Destailleur
c4bc10b8eb Qual: Clean code by moving synchro with mailman into mailman trigger 
New: A trigger can return an array of error strings instead of one error
string.
 2013-08-21 12:39:20 +02:00
simnandez
913888824f Remove duplicate $user 2013-08-20 12:26:39 +02:00
Christophe Battarel
4c7741f5f0 manage user permissions for margin display 2013-08-20 12:11:19 +02:00
Christophe Battarel
06b8e939bd manage user permissions for margin rate 2013-08-20 12:04:01 +02:00
Christophe Battarel
220f9b7e9f define global user variables so templates can manage user permissions 2013-08-20 12:01:52 +02:00
Christophe Battarel
8128ed0556 define user permissions on margin module 
update changelog
 2013-08-20 12:00:16 +02:00
Laurent Destailleur
e460aa335c New: When there is no data on pie chart, can set color to an empty 
value.
 2013-08-20 11:51:24 +02:00
Laurent Destailleur
b18d5166de Fix: Size of picture into PDF 2013-08-19 13:30:30 +02:00
Grand Philippe
49e38e1263 fix some trad 2013-08-16 10:16:06 +02:00
Juanjo Menent
8ba3410766 Merge pull request #1179 from altatof/saisie_marges 
ability to define margin rate on quotes, orders, invoices
 2013-08-14 01:00:29 -07:00
simnandez
3577025f0e Fix update extrafield do not display immediatly 2013-08-14 09:56:08 +02:00
Florian Henry
60b3f61339 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 
Conflicts:
	ChangeLog
 2013-08-13 12:13:47 +02:00
simnandez
5cbfa61731 Fix: [ bug #1033 ] SUPPLIER REF disappeared 2013-08-12 18:44:03 +02:00
simnandez
067c8c55b9 Fix: [ bug #1033 ] SUPPLIER REF disappeared 2013-08-12 18:42:01 +02:00
Christophe Battarel
29d329a1d2 ability to define margin rate on quotes, orders, invoices 
more to come : same on edit, user permissions
 2013-08-12 15:34:09 +02:00
Florian Henry
26d1352de4 Fix update extrafield do not display immediatly 2013-08-12 14:30:42 +02:00
Laurent Destailleur
3502747247 Merge pull request #1175 from FHenry/develop 
Add pdf link into supplier invoice list and supplier order list
 2013-08-09 12:18:40 -07:00
Laurent Destailleur
ff4ebe423b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-08-09 19:21:32 +02:00
Laurent Destailleur
59c1f54d68 New: Enhance DolGraph class for pie charts. 2013-08-09 19:19:48 +02:00
Florian Henry
3cf3dbeb51 Add pdf link into supplier invoice list and supplier order list 2013-08-09 13:48:44 +02:00
Florian Henry
75701ee995 Fix: Supplier invoice and supplier order are not displayed into object 
link into agenda event card
 2013-08-09 13:11:18 +02:00
Laurent Destailleur
ecf8e06487 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-08-08 20:07:24 +02:00
Laurent Destailleur
bfd2d7ada2 Fix: Sort order works with special chars. 2013-08-08 20:06:56 +02:00
simnandez
6b1484c2ea Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count 2013-08-08 17:11:54 +02:00
Laurent Destailleur
4f9a1768d5 Work on graphical box with product distribution 2013-08-08 14:36:35 +02:00
simnandez
b9e1a57f67 Fix: [ bug #1029 ] Tulip numbering mask 2013-08-08 10:00:06 +02:00
Laurent Destailleur
2a0597a6d4 Merge pull request #1161 from PaulPoulain/948-develop 
T948-develop :Classify Billed when the price of bill is greater than command
 2013-08-07 16:48:32 -07:00
Laurent Destailleur
b1f528f4d5 Comment code of a deprecated variable. 2013-08-07 20:56:10 +02:00
Laurent Destailleur
0f86755033 Fix: Found a dozen of bugs into sub module delivery of module shipment. 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
 2013-08-07 15:29:13 +02:00
Laurent Destailleur
d5a57f3717 Fix: Found a dozen of bugs into sub module delivery of module shipment. 2013-08-07 15:08:30 +02:00
Laurent Destailleur
4d67d02f33 Fix: Bad dir 2013-08-07 13:35:09 +02:00
Laurent Destailleur
539adfdcc4 Fix: Bad var name 2013-08-07 13:33:22 +02:00
Laurent Destailleur
4346a3f90f Fix: Param must be a regex string 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-08-06 19:34:13 +02:00
Laurent Destailleur
3caf119596 Fix: Param must be a regex string 2013-08-06 19:23:43 +02:00
lalaina rasamoelina
0fa4739d47 T948-develop :Classify Billed when the price of bill is greater than command 
-In the workflow i've added on bouton which permitted
		to classify billed when the price of bills is greater
 		than command,if her status is delivered

		/htdocs/admin/workflow.php
 2013-08-06 16:57:40 +02:00
Juanjo Menent
aab90bfe76 Merge pull request #1154 from atm-maxime/develop 
Fix : supplier invoice mask + numbering
 2013-08-06 06:37:32 -07:00
Maxime Kohlhaas
3586c41a8e Numbering should be on invoice date, not creation date 2013-08-06 15:29:20 +02:00
Maxime Kohlhaas
08a3b0c905 Fix : supplier invoice mask + numbering 2013-08-06 15:27:51 +02:00
Laurent Destailleur
c3dd7c3b39 Fix: Tons of regression after renaming note field into note_private. 2013-08-06 13:22:35 +02:00
Laurent Destailleur
2750b1a298 Fix: Tons of regression after renaming note field into note_private. 
Qual: Add phpunit test to test all exports descriptors.
 2013-08-06 13:22:00 +02:00
Laurent Destailleur
91700d84a6 Fix: lang file 2013-08-06 03:56:59 +02:00
Laurent Destailleur
b7cada9a99 Fix: End of menu when no module selected. 2013-08-06 03:01:56 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
8d90289bfc Merge pull request #1153 from csalvador/print_address_hook 
added hook to the print address function
 2013-08-05 11:51:08 -07:00
Laurent Destailleur
218e9f5b33 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-08-05 18:55:38 +02:00
Laurent Destailleur
928446596d Perf: Optimize memory usage when generating graph. 2013-08-05 18:30:10 +02:00
Cédric Salvador
0127ed8b33 added hook to the print address function 2013-08-05 18:07:10 +02:00
Laurent Destailleur
85572a4bd1 New: Start to work on box for product distributions 
Qual: Start to move code of dol_print_graph function into class
DolGraph.
 2013-08-05 17:19:49 +02:00
Laurent Destailleur
447d0063af Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/ca_ES/withdrawals.lang
	htdocs/langs/es_ES/withdrawals.lang
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/langs/ja_JP/compta.lang
	htdocs/langs/ja_JP/contracts.lang
	htdocs/langs/sl_SI/withdrawals.lang
	htdocs/langs/zh_CN/admin.lang
	htdocs/langs/zh_CN/agenda.lang
	htdocs/langs/zh_CN/bills.lang
	htdocs/langs/zh_CN/boxes.lang
	htdocs/langs/zh_CN/commercial.lang
	htdocs/langs/zh_CN/companies.lang
	htdocs/langs/zh_CN/compta.lang
	htdocs/langs/zh_CN/contracts.lang
	htdocs/langs/zh_CN/errors.lang
	htdocs/langs/zh_CN/exports.lang
	htdocs/langs/zh_CN/install.lang
	htdocs/langs/zh_CN/interventions.lang
	htdocs/langs/zh_CN/mails.lang
	htdocs/langs/zh_CN/main.lang
	htdocs/langs/zh_CN/members.lang
	htdocs/langs/zh_CN/orders.lang
	htdocs/langs/zh_CN/other.lang
	htdocs/langs/zh_CN/products.lang
	htdocs/langs/zh_CN/propal.lang
	htdocs/langs/zh_CN/stocks.lang
	htdocs/langs/zh_CN/suppliers.lang
	htdocs/langs/zh_CN/users.lang
	htdocs/langs/zh_TW/admin.lang
	htdocs/langs/zh_TW/agenda.lang
	htdocs/langs/zh_TW/banks.lang
	htdocs/langs/zh_TW/boxes.lang
	htdocs/langs/zh_TW/companies.lang
	htdocs/langs/zh_TW/compta.lang
	htdocs/langs/zh_TW/contracts.lang
	htdocs/langs/zh_TW/errors.lang
	htdocs/langs/zh_TW/exports.lang
	htdocs/langs/zh_TW/install.lang
	htdocs/langs/zh_TW/interventions.lang
	htdocs/langs/zh_TW/mails.lang
	htdocs/langs/zh_TW/members.lang
	htdocs/langs/zh_TW/orders.lang
	htdocs/langs/zh_TW/propal.lang
	htdocs/langs/zh_TW/suppliers.lang
 2013-08-03 16:24:52 +02:00
simnandez
283d9eb064 Text for invoices numbering modules more clear. Update ChangeLog 2013-08-02 15:27:37 +02:00
Laurent Destailleur
c18fed7e4c New: A box can use a "or" on module conditions 2013-08-02 14:54:22 +02:00
Juanjo Menent
ba8d094ec5 Merge pull request #1152 from atm-maxime/develop 
Better fix for email text / signature integration
 2013-08-02 03:13:42 -07:00
simnandez
6d1a021382 New: [ task #1005 ] Update mercure module with replacement invoices. 2013-08-02 12:11:14 +02:00
simnandez
d0bd188e74 New: [ task #1005 ] Improves and best adaptations 2013-08-02 10:44:14 +02:00
Maxime Kohlhaas
a0738e86d8 Better fix for email text / signature integration 2013-08-02 10:24:09 +02:00
Laurent Destailleur
a35ee022f3 Merge pull request #1150 from atm-maxime/develop 
Task # 1016 : deposits numbering
 2013-08-01 13:06:46 -07:00
simnandez
d8fcec287b Fix: Reverse mars-es_ES to mars. It is not a numbering only for Spain. 2013-08-01 18:44:21 +02:00
Laurent Destailleur
3730d874c9 Fix: [ bug #991 ] Error when adding a product in POS when no Tax is 
associated to the country of the company
 2013-08-01 18:09:01 +02:00
Laurent Destailleur
8b0169f468 Fix: [ bug #991 ] Error when adding a product in POS when no Tax is 
associated to the country of the company
 2013-08-01 18:01:25 +02:00
Laurent Destailleur
4f464eb226 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/modules/export/export_excel2007.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/langs/fr_FR/agenda.lang
	htdocs/langs/fr_FR/errors.lang
 2013-08-01 17:42:18 +02:00
Laurent Destailleur
1fb8baa92e Fix: [ bug #1009 ] ZipArchive' not found 2013-08-01 16:56:17 +02:00
Maxime Kohlhaas
a6ef341ae7 Task # 1016 : can define a specific numbering for deposits 2013-08-01 16:30:31 +02:00
Laurent Destailleur
4786c90c4a Fix: Pb into export descriptions 2013-08-01 15:30:27 +02:00
Laurent Destailleur
bd33e8a962 Fix: Export of country 2013-08-01 15:28:19 +02:00
Laurent Destailleur
98bd56e229 Fix: Pb into export descriptions 2013-08-01 15:26:01 +02:00
Laurent Destailleur
e6022527dd Fix: Export of country 2013-08-01 12:49:46 +02:00
Laurent Destailleur
2fa1032079 Merge pull request #1145 from atm-maxime/develop 
Fix : email message combined with html signature made troubles with line breaks
 2013-08-01 02:09:52 -07:00
Laurent Destailleur
ba2c6d4d54 Fix: Confirm boxes with jmobile 2013-08-01 05:13:13 +02:00
Laurent Destailleur
53672dff75 Fix: Confirm boxes with jmobile 2013-08-01 04:20:08 +02:00
Laurent Destailleur
a334b96469 Optimize screen size 2013-08-01 02:28:47 +02:00
Florian Henry
325ceda4dc [ task #1014 ] Add option to recursivly add parent cactegory 2013-07-31 21:52:49 +02:00
Maxime Kohlhaas
3395df2b66 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2013-07-31 15:23:27 +02:00
Laurent Destailleur
6e289874fe Merge pull request #1146 from csalvador/callfix 
fixed bad function call causing select_produits_list to fail
 2013-07-31 05:52:19 -07:00
Laurent Destailleur
e234d5342d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/contrat/liste.php
 2013-07-31 12:45:39 +02:00
Cédric Salvador
f0bbdfddfb fixed bad function call causing select_produits_list to fail 2013-07-31 10:08:33 +02:00
Maxime Kohlhaas
27cfe802aa Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2013-07-31 09:03:20 +02:00
Laurent Destailleur
75e2350e6a Fix: Mutualizing code fix bug into duplicate code of contact management 
for project.
 2013-07-30 19:08:58 +02:00
Maxime Kohlhaas
c40e187842 Typo 2013-07-30 17:30:09 +02:00
Maxime Kohlhaas
dfae157cc5 Fix : email message combined with html signature made troubles with line breaks 2013-07-30 17:29:24 +02:00
Laurent Destailleur
57ce331833 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-30 17:23:13 +02:00
Laurent Destailleur
eeb8ef57c9 Fix: grip and close for title must differ from grip and close used for 
other styles.
 2013-07-30 17:22:52 +02:00
Maxime Kohlhaas
bfb01da04f Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko1011 2013-07-30 16:22:13 +02:00
Maxime Kohlhaas
dae36229a4 Task # 1011 : add payment terms and payment mode on supplier card 2013-07-30 15:06:57 +02:00
Florian Henry
21bdabc248 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-07-30 14:19:05 +02:00
Florian Henry
3bc7d3c877 Fix extrafeild thirdparty import and export 2013-07-30 14:18:56 +02:00
Laurent Destailleur
a48236b304 Merge pull request #1139 from GPCsolutions/replenishment 
Replenishment Task #918
 2013-07-30 03:28:13 -07:00
Laurent Destailleur
1c24f9e35e Merge pull request #1138 from atm-maxime/3.4 
Fix : Numbering on supplier invoice was not saved and on shipment displa...
 2013-07-30 03:22:29 -07:00
Cédric Salvador
370f6ac857 fixed select_product_fourn_price closes #43 2013-07-30 10:24:37 +02:00
Maxime Kohlhaas
f9c2910f84 Fix : Numbering on supplier invoice was not saved and on shipment displayed error when ok 2013-07-30 09:21:45 +02:00
Laurent Destailleur
87713c49ac New: Into POST forms, if you can add a parameter DOL_AUTOSET_COOKIE with 
a vlue that is list name, separated by a coma, of other POST parameters,
Dolibarr will automatically save this parameters into user cookies.
New: Can select to see number or amount or both, for graph boxes.
 2013-07-29 19:12:04 +02:00
Cédric Salvador
bd9c4556e8 Preselected supplier when there's only one 2013-07-29 12:31:13 +02:00
Cédric Salvador
9dfa5c4218 selects 2013-07-29 12:31:09 +02:00
Cédric Salvador
8666725c62 Preselected supplier when there's only one 2013-07-29 12:31:08 +02:00
Cédric Salvador
0e77b273df copyright 2013-07-29 12:31:06 +02:00
Cédric Salvador
da5bbd0a08 moved page + added link in the left menu 2013-07-29 12:31:06 +02:00
Florian Henry
d6f31d61bf Fix Typhon model $mysoc global is missing 2013-07-29 12:21:52 +02:00
Laurent Destailleur
ad6bd5047f Add error log to warn when module does not match specifications. 2013-07-28 14:42:50 +02:00
Laurent Destailleur
0743521b6b - No need to load css of plugin fileupload (plugin never loaded). Too 
much bugged to be included by default.
- Vertical menu must be under horizontal menu, even if horizontal menu
is wrapped.
- Add an empty li at end of list to provide more options for skins.
 2013-07-28 05:35:51 +02:00
Laurent Destailleur
843478317e Qual: Reduce CSS size by mutualizings styles. 2013-07-27 18:21:35 +02:00
Laurent Destailleur
444a3328c6 New: More options to select status of users into select user list. 2013-07-27 14:45:55 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-27 14:21:47 +02:00
Laurent Destailleur
14dfbfc40c Fix: W3C (form into tr make some browsers crazy) 2013-07-27 13:29:06 +02:00
Laurent Destailleur
14dc6b0025 Merge pull request #1070 from jfefe/extra-listlabel 
Can choose several fields to display with extrafield list of table
 2013-07-27 03:24:34 -07:00
Laurent Destailleur
385d3612c5 Merge pull request #1136 from jfefe/extrarequired 
Missing checks on extrafields
 2013-07-27 03:09:44 -07:00
Laurent Destailleur
2f25e07e5a Add class for body into login page 2013-07-27 11:53:15 +02:00
Laurent Destailleur
5ea500383c Merge pull request #1102 from PaulPoulain/978-develop 
[BUGFIX] T978 Delete users who are disabled
 2013-07-27 02:50:11 -07:00
jfefe
90e245ca5a Merge branch 'extra-listlabel' of github.com:jfefe/dolibarr into extra-listlabel 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-07-27 01:29:05 +02:00
jfefe
95e2f30f6b Can choose several fields to display with extrafield list of table 2013-07-27 01:21:19 +02:00
Laurent Destailleur
99e5bf3120 New: Enhance graphical boxes. Prepare to show filters form to modify 
graph.
 2013-07-26 18:40:43 +02:00
jfefe
473541f19d Fix : bad test field when checking extrafield is required 2013-07-26 15:41:17 +02:00
Laurent Destailleur
d0af692ed5 Fix: date must be reported according to user timezone 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-07-26 15:23:41 +02:00
Laurent Destailleur
f2f8d60f19 Fix: date must be reported according to user timezone 2013-07-26 15:21:32 +02:00
Laurent Destailleur
5608e320f7 New: Can add a suffix into filename of template after -. This may be 
used in future as specific criteria to filter list of numbering models
to show.
 2013-07-26 15:10:56 +02:00
Laurent Destailleur
8e3d86c7a5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2013-07-26 14:59:18 +02:00
Laurent Destailleur
e5de4c10ad Fix: date must be reported according to user timezone 2013-07-26 14:49:46 +02:00
jfefe
c431fc716f Check if an required extrafield is filled. 
Method setOptionalsFromPost now return -1 if required field is blank
 2013-07-26 13:18:23 +02:00
simnandez
7efacecb08 New: [ task #1005 ] Adapting to Spanish legislation bill numbering 2013-07-26 12:46:34 +02:00
Maxime Kohlhaas
1199e61f4b CRLF issue 2013-07-26 12:33:58 +02:00
Laurent Destailleur
1e96452c6c New: Can show images of product onto proposals. 2013-07-26 12:24:30 +02:00
Laurent Destailleur
c4d3307bfa Qual: Normalize file name. 2013-07-26 11:36:36 +02:00
Laurent Destailleur
61f11d3621 Fix: Duplicate tooltip 2013-07-26 11:12:29 +02:00
jfefe
95bc40d0df Missing attribute to indicate required fields 2013-07-26 08:51:22 +02:00
Laurent Destailleur
3ecb9c2dd8 Merge pull request #1130 from FHenry/3.4 
Avoid php warning if extrafield "list from table" have bad settings
 2013-07-25 13:40:09 -07:00
Laurent Destailleur
fe079f71da Merge remote-tracking branch 'origin/3.3' into 3.4 2013-07-25 21:53:38 +02:00
Florian Henry
2f112efad5 Avoid php warning if extrafield list from table have bad settings 2013-07-25 20:18:45 +02:00
Laurent Destailleur
16d530b22d Fix: Watermark make pagebreak crazy. 2013-07-25 18:58:47 +02:00
Laurent Destailleur
58da76292f Fix: Watermark make pagebreak crazy. 2013-07-25 18:56:09 +02:00
Laurent Destailleur
339118d6f4 Prepare for option MAIN_GENERATE_PROPOSALS_WITH_PICTURE 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-24 20:20:31 +02:00
Laurent Destailleur
6b1b6b4fee Fix: Color no more lost 2013-07-24 20:20:10 +02:00
Laurent Destailleur
44682bd932 Merge pull request #1128 from defrance69/patch-9 
Update pdf_blochet.class.php
 2013-07-24 07:07:41 -07:00
Laurent Destailleur
2266b8b2a4 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/langs/ar_SA/bookmarks.lang
	htdocs/langs/ar_SA/boxes.lang
	htdocs/langs/ar_SA/cashdesk.lang
	htdocs/langs/ar_SA/categories.lang
	htdocs/langs/ar_SA/commercial.lang
	htdocs/langs/ar_SA/companies.lang
	htdocs/langs/ar_SA/compta.lang
	htdocs/langs/ar_SA/contracts.lang
	htdocs/langs/ar_SA/deliveries.lang
	htdocs/langs/ar_SA/dict.lang
	htdocs/langs/ar_SA/donations.lang
	htdocs/langs/ar_SA/ecm.lang
	htdocs/langs/ar_SA/errors.lang
	htdocs/langs/ar_SA/exports.lang
	htdocs/langs/ar_SA/externalsite.lang
	htdocs/langs/ar_SA/ftp.lang
	htdocs/langs/ar_SA/help.lang
	htdocs/langs/ar_SA/install.lang
	htdocs/langs/ar_SA/interventions.lang
	htdocs/langs/ar_SA/languages.lang
	htdocs/langs/ar_SA/ldap.lang
	htdocs/langs/ar_SA/mails.lang
	htdocs/langs/ar_SA/main.lang
	htdocs/langs/ar_SA/members.lang
	htdocs/langs/ar_SA/orders.lang
	htdocs/langs/ar_SA/oscommerce.lang
	htdocs/langs/ar_SA/paybox.lang
	htdocs/langs/ar_SA/paypal.lang
	htdocs/langs/ar_SA/projects.lang
	htdocs/langs/ar_SA/propal.lang
	htdocs/langs/ar_SA/sendings.lang
	htdocs/langs/ar_SA/shop.lang
	htdocs/langs/ar_SA/sms.lang
	htdocs/langs/ar_SA/stocks.lang
	htdocs/langs/ar_SA/suppliers.lang
	htdocs/langs/ar_SA/trips.lang
	htdocs/langs/ar_SA/users.lang
	htdocs/langs/ar_SA/withdrawals.lang
	htdocs/langs/ar_SA/workflow.lang
	htdocs/langs/bg_BG/admin.lang
	htdocs/langs/bg_BG/agenda.lang
	htdocs/langs/bg_BG/banks.lang
	htdocs/langs/bg_BG/bills.lang
	htdocs/langs/bg_BG/bookmarks.lang
	htdocs/langs/bg_BG/boxes.lang
	htdocs/langs/bg_BG/cashdesk.lang
	htdocs/langs/bg_BG/categories.lang
	htdocs/langs/bg_BG/commercial.lang
	htdocs/langs/bg_BG/companies.lang
	htdocs/langs/bg_BG/compta.lang
	htdocs/langs/bg_BG/contracts.lang
	htdocs/langs/bg_BG/deliveries.lang
	htdocs/langs/bg_BG/dict.lang
	htdocs/langs/bg_BG/donations.lang
	htdocs/langs/bg_BG/ecm.lang
	htdocs/langs/bg_BG/errors.lang
	htdocs/langs/bg_BG/exports.lang
	htdocs/langs/bg_BG/externalsite.lang
	htdocs/langs/bg_BG/ftp.lang
	htdocs/langs/bg_BG/help.lang
	htdocs/langs/bg_BG/holiday.lang
	htdocs/langs/bg_BG/install.lang
	htdocs/langs/bg_BG/interventions.lang
	htdocs/langs/bg_BG/languages.lang
	htdocs/langs/bg_BG/ldap.lang
	htdocs/langs/bg_BG/mailmanspip.lang
	htdocs/langs/bg_BG/mails.lang
	htdocs/langs/bg_BG/main.lang
	htdocs/langs/bg_BG/members.lang
	htdocs/langs/bg_BG/orders.lang
	htdocs/langs/bg_BG/oscommerce.lang
	htdocs/langs/bg_BG/other.lang
	htdocs/langs/bg_BG/paybox.lang
	htdocs/langs/bg_BG/paypal.lang
	htdocs/langs/bg_BG/products.lang
	htdocs/langs/bg_BG/projects.lang
	htdocs/langs/bg_BG/propal.lang
	htdocs/langs/bg_BG/sendings.lang
	htdocs/langs/bg_BG/shop.lang
	htdocs/langs/bg_BG/sms.lang
	htdocs/langs/bg_BG/stocks.lang
	htdocs/langs/bg_BG/suppliers.lang
	htdocs/langs/bg_BG/trips.lang
	htdocs/langs/bg_BG/users.lang
	htdocs/langs/bg_BG/withdrawals.lang
	htdocs/langs/bg_BG/workflow.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/da_DK/agenda.lang
	htdocs/langs/da_DK/banks.lang
	htdocs/langs/da_DK/bookmarks.lang
	htdocs/langs/da_DK/boxes.lang
	htdocs/langs/da_DK/cashdesk.lang
	htdocs/langs/da_DK/categories.lang
	htdocs/langs/da_DK/commercial.lang
	htdocs/langs/da_DK/companies.lang
	htdocs/langs/da_DK/compta.lang
	htdocs/langs/da_DK/contracts.lang
	htdocs/langs/da_DK/deliveries.lang
	htdocs/langs/da_DK/dict.lang
	htdocs/langs/da_DK/donations.lang
	htdocs/langs/da_DK/errors.lang
	htdocs/langs/da_DK/exports.lang
	htdocs/langs/da_DK/externalsite.lang
	htdocs/langs/da_DK/ftp.lang
	htdocs/langs/da_DK/install.lang
	htdocs/langs/da_DK/interventions.lang
	htdocs/langs/da_DK/languages.lang
	htdocs/langs/da_DK/mails.lang
	htdocs/langs/da_DK/members.lang
	htdocs/langs/da_DK/orders.lang
	htdocs/langs/da_DK/oscommerce.lang
	htdocs/langs/da_DK/paybox.lang
	htdocs/langs/da_DK/paypal.lang
	htdocs/langs/da_DK/projects.lang
	htdocs/langs/da_DK/propal.lang
	htdocs/langs/da_DK/sendings.lang
	htdocs/langs/da_DK/shop.lang
	htdocs/langs/da_DK/sms.lang
	htdocs/langs/da_DK/stocks.lang
	htdocs/langs/da_DK/suppliers.lang
	htdocs/langs/da_DK/trips.lang
	htdocs/langs/da_DK/users.lang
	htdocs/langs/da_DK/withdrawals.lang
	htdocs/langs/da_DK/workflow.lang
	htdocs/langs/de_DE/admin.lang
	htdocs/langs/de_DE/agenda.lang
	htdocs/langs/de_DE/banks.lang
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/de_DE/bookmarks.lang
	htdocs/langs/de_DE/boxes.lang
	htdocs/langs/de_DE/cashdesk.lang
	htdocs/langs/de_DE/categories.lang
	htdocs/langs/de_DE/commercial.lang
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/de_DE/compta.lang
	htdocs/langs/de_DE/contracts.lang
	htdocs/langs/de_DE/deliveries.lang
	htdocs/langs/de_DE/dict.lang
	htdocs/langs/de_DE/donations.lang
	htdocs/langs/de_DE/ecm.lang
	htdocs/langs/de_DE/errors.lang
	htdocs/langs/de_DE/exports.lang
	htdocs/langs/de_DE/externalsite.lang
	htdocs/langs/de_DE/ftp.lang
	htdocs/langs/de_DE/help.lang
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/interventions.lang
	htdocs/langs/de_DE/languages.lang
	htdocs/langs/de_DE/ldap.lang
	htdocs/langs/de_DE/mails.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/de_DE/members.lang
	htdocs/langs/de_DE/orders.lang
	htdocs/langs/de_DE/oscommerce.lang
	htdocs/langs/de_DE/other.lang
	htdocs/langs/de_DE/paybox.lang
	htdocs/langs/de_DE/paypal.lang
	htdocs/langs/de_DE/products.lang
	htdocs/langs/de_DE/projects.lang
	htdocs/langs/de_DE/propal.lang
	htdocs/langs/de_DE/sendings.lang
	htdocs/langs/de_DE/shop.lang
	htdocs/langs/de_DE/sms.lang
	htdocs/langs/de_DE/stocks.lang
	htdocs/langs/de_DE/suppliers.lang
	htdocs/langs/de_DE/trips.lang
	htdocs/langs/de_DE/users.lang
	htdocs/langs/de_DE/withdrawals.lang
	htdocs/langs/de_DE/workflow.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/langs/en_US/bookmarks.lang
	htdocs/langs/en_US/ftp.lang
	htdocs/langs/en_US/other.lang
	htdocs/langs/en_US/paypal.lang
	htdocs/langs/et_EE/admin.lang
	htdocs/langs/et_EE/agenda.lang
	htdocs/langs/et_EE/banks.lang
	htdocs/langs/et_EE/bills.lang
	htdocs/langs/et_EE/bookmarks.lang
	htdocs/langs/et_EE/boxes.lang
	htdocs/langs/et_EE/cashdesk.lang
	htdocs/langs/et_EE/categories.lang
	htdocs/langs/et_EE/commercial.lang
	htdocs/langs/et_EE/companies.lang
	htdocs/langs/et_EE/compta.lang
	htdocs/langs/et_EE/contracts.lang
	htdocs/langs/et_EE/deliveries.lang
	htdocs/langs/et_EE/dict.lang
	htdocs/langs/et_EE/donations.lang
	htdocs/langs/et_EE/ecm.lang
	htdocs/langs/et_EE/errors.lang
	htdocs/langs/et_EE/exports.lang
	htdocs/langs/et_EE/externalsite.lang
	htdocs/langs/et_EE/ftp.lang
	htdocs/langs/et_EE/help.lang
	htdocs/langs/et_EE/install.lang
	htdocs/langs/et_EE/interventions.lang
	htdocs/langs/et_EE/languages.lang
	htdocs/langs/et_EE/ldap.lang
	htdocs/langs/et_EE/mails.lang
	htdocs/langs/et_EE/main.lang
	htdocs/langs/et_EE/members.lang
	htdocs/langs/et_EE/orders.lang
	htdocs/langs/et_EE/oscommerce.lang
	htdocs/langs/et_EE/other.lang
	htdocs/langs/et_EE/paybox.lang
	htdocs/langs/et_EE/paypal.lang
	htdocs/langs/et_EE/products.lang
	htdocs/langs/et_EE/projects.lang
	htdocs/langs/et_EE/propal.lang
	htdocs/langs/et_EE/sendings.lang
	htdocs/langs/et_EE/shop.lang
	htdocs/langs/et_EE/sms.lang
	htdocs/langs/et_EE/stocks.lang
	htdocs/langs/et_EE/suppliers.lang
	htdocs/langs/et_EE/trips.lang
	htdocs/langs/et_EE/users.lang
	htdocs/langs/et_EE/withdrawals.lang
	htdocs/langs/et_EE/workflow.lang
	htdocs/langs/fa_IR/agenda.lang
	htdocs/langs/fa_IR/banks.lang
	htdocs/langs/fa_IR/bookmarks.lang
	htdocs/langs/fa_IR/boxes.lang
	htdocs/langs/fa_IR/categories.lang
	htdocs/langs/fa_IR/commercial.lang
	htdocs/langs/fa_IR/companies.lang
	htdocs/langs/fa_IR/compta.lang
	htdocs/langs/fa_IR/contracts.lang
	htdocs/langs/fa_IR/deliveries.lang
	htdocs/langs/fa_IR/dict.lang
	htdocs/langs/fa_IR/donations.lang
	htdocs/langs/fa_IR/ecm.lang
	htdocs/langs/fa_IR/errors.lang
	htdocs/langs/fa_IR/exports.lang
	htdocs/langs/fa_IR/ftp.lang
	htdocs/langs/fa_IR/help.lang
	htdocs/langs/fa_IR/install.lang
	htdocs/langs/fa_IR/interventions.lang
	htdocs/langs/fa_IR/languages.lang
	htdocs/langs/fa_IR/ldap.lang
	htdocs/langs/fa_IR/mails.lang
	htdocs/langs/fa_IR/main.lang
	htdocs/langs/fa_IR/members.lang
	htdocs/langs/fa_IR/orders.lang
	htdocs/langs/fa_IR/oscommerce.lang
	htdocs/langs/fa_IR/paybox.lang
	htdocs/langs/fa_IR/paypal.lang
	htdocs/langs/fa_IR/projects.lang
	htdocs/langs/fa_IR/propal.lang
	htdocs/langs/fa_IR/shop.lang
	htdocs/langs/fa_IR/stocks.lang
	htdocs/langs/fa_IR/suppliers.lang
	htdocs/langs/fa_IR/trips.lang
	htdocs/langs/fa_IR/users.lang
	htdocs/langs/fa_IR/withdrawals.lang
	htdocs/langs/fi_FI/agenda.lang
	htdocs/langs/fi_FI/banks.lang
	htdocs/langs/fi_FI/bookmarks.lang
	htdocs/langs/fi_FI/boxes.lang
	htdocs/langs/fi_FI/cashdesk.lang
	htdocs/langs/fi_FI/categories.lang
	htdocs/langs/fi_FI/commercial.lang
	htdocs/langs/fi_FI/companies.lang
	htdocs/langs/fi_FI/compta.lang
	htdocs/langs/fi_FI/contracts.lang
	htdocs/langs/fi_FI/deliveries.lang
	htdocs/langs/fi_FI/dict.lang
	htdocs/langs/fi_FI/donations.lang
	htdocs/langs/fi_FI/errors.lang
	htdocs/langs/fi_FI/exports.lang
	htdocs/langs/fi_FI/externalsite.lang
	htdocs/langs/fi_FI/ftp.lang
	htdocs/langs/fi_FI/install.lang
	htdocs/langs/fi_FI/interventions.lang
	htdocs/langs/fi_FI/languages.lang
	htdocs/langs/fi_FI/mails.lang
	htdocs/langs/fi_FI/members.lang
	htdocs/langs/fi_FI/orders.lang
	htdocs/langs/fi_FI/paybox.lang
	htdocs/langs/fi_FI/paypal.lang
	htdocs/langs/fi_FI/projects.lang
	htdocs/langs/fi_FI/propal.lang
	htdocs/langs/fi_FI/sendings.lang
	htdocs/langs/fi_FI/sms.lang
	htdocs/langs/fi_FI/stocks.lang
	htdocs/langs/fi_FI/suppliers.lang
	htdocs/langs/fi_FI/trips.lang
	htdocs/langs/fi_FI/users.lang
	htdocs/langs/fi_FI/withdrawals.lang
	htdocs/langs/fi_FI/workflow.lang
	htdocs/langs/fr_FR/bookmarks.lang
	htdocs/langs/fr_FR/externalsite.lang
	htdocs/langs/fr_FR/other.lang
	htdocs/langs/fr_FR/paybox.lang
	htdocs/langs/fr_FR/paypal.lang
	htdocs/langs/he_IL/workflow.lang
	htdocs/langs/hu_HU/admin.lang
	htdocs/langs/hu_HU/agenda.lang
	htdocs/langs/hu_HU/banks.lang
	htdocs/langs/hu_HU/bills.lang
	htdocs/langs/hu_HU/boxes.lang
	htdocs/langs/hu_HU/cashdesk.lang
	htdocs/langs/hu_HU/commercial.lang
	htdocs/langs/hu_HU/companies.lang
	htdocs/langs/hu_HU/compta.lang
	htdocs/langs/hu_HU/contracts.lang
	htdocs/langs/hu_HU/deliveries.lang
	htdocs/langs/hu_HU/dict.lang
	htdocs/langs/hu_HU/donations.lang
	htdocs/langs/hu_HU/errors.lang
	htdocs/langs/hu_HU/exports.lang
	htdocs/langs/hu_HU/externalsite.lang
	htdocs/langs/hu_HU/install.lang
	htdocs/langs/hu_HU/interventions.lang
	htdocs/langs/hu_HU/languages.lang
	htdocs/langs/hu_HU/mails.lang
	htdocs/langs/hu_HU/main.lang
	htdocs/langs/hu_HU/members.lang
	htdocs/langs/hu_HU/orders.lang
	htdocs/langs/hu_HU/oscommerce.lang
	htdocs/langs/hu_HU/other.lang
	htdocs/langs/hu_HU/paybox.lang
	htdocs/langs/hu_HU/paypal.lang
	htdocs/langs/hu_HU/projects.lang
	htdocs/langs/hu_HU/propal.lang
	htdocs/langs/hu_HU/sendings.lang
	htdocs/langs/hu_HU/sms.lang
	htdocs/langs/hu_HU/stocks.lang
	htdocs/langs/hu_HU/suppliers.lang
	htdocs/langs/hu_HU/trips.lang
	htdocs/langs/hu_HU/users.lang
	htdocs/langs/hu_HU/withdrawals.lang
	htdocs/langs/hu_HU/workflow.lang
	htdocs/langs/is_IS/agenda.lang
	htdocs/langs/is_IS/banks.lang
	htdocs/langs/is_IS/bookmarks.lang
	htdocs/langs/is_IS/boxes.lang
	htdocs/langs/is_IS/cashdesk.lang
	htdocs/langs/is_IS/categories.lang
	htdocs/langs/is_IS/commercial.lang
	htdocs/langs/is_IS/companies.lang
	htdocs/langs/is_IS/compta.lang
	htdocs/langs/is_IS/contracts.lang
	htdocs/langs/is_IS/deliveries.lang
	htdocs/langs/is_IS/dict.lang
	htdocs/langs/is_IS/donations.lang
	htdocs/langs/is_IS/ecm.lang
	htdocs/langs/is_IS/errors.lang
	htdocs/langs/is_IS/exports.lang
	htdocs/langs/is_IS/externalsite.lang
	htdocs/langs/is_IS/ftp.lang
	htdocs/langs/is_IS/help.lang
	htdocs/langs/is_IS/install.lang
	htdocs/langs/is_IS/interventions.lang
	htdocs/langs/is_IS/languages.lang
	htdocs/langs/is_IS/ldap.lang
	htdocs/langs/is_IS/mails.lang
	htdocs/langs/is_IS/main.lang
	htdocs/langs/is_IS/members.lang
	htdocs/langs/is_IS/orders.lang
	htdocs/langs/is_IS/oscommerce.lang
	htdocs/langs/is_IS/paybox.lang
	htdocs/langs/is_IS/paypal.lang
	htdocs/langs/is_IS/products.lang
	htdocs/langs/is_IS/projects.lang
	htdocs/langs/is_IS/propal.lang
	htdocs/langs/is_IS/sendings.lang
	htdocs/langs/is_IS/shop.lang
	htdocs/langs/is_IS/sms.lang
	htdocs/langs/is_IS/stocks.lang
	htdocs/langs/is_IS/suppliers.lang
	htdocs/langs/is_IS/trips.lang
	htdocs/langs/is_IS/users.lang
	htdocs/langs/is_IS/withdrawals.lang
	htdocs/langs/is_IS/workflow.lang
	htdocs/langs/it_IT/bookmarks.lang
	htdocs/langs/it_IT/cashdesk.lang
	htdocs/langs/it_IT/errors.lang
	htdocs/langs/it_IT/exports.lang
	htdocs/langs/it_IT/externalsite.lang
	htdocs/langs/it_IT/languages.lang
	htdocs/langs/it_IT/paybox.lang
	htdocs/langs/it_IT/paypal.lang
	htdocs/langs/it_IT/projects.lang
	htdocs/langs/it_IT/propal.lang
	htdocs/langs/it_IT/sendings.lang
	htdocs/langs/it_IT/sms.lang
	htdocs/langs/it_IT/workflow.lang
	htdocs/langs/ja_JP/admin.lang
	htdocs/langs/ja_JP/agenda.lang
	htdocs/langs/ja_JP/banks.lang
	htdocs/langs/ja_JP/bills.lang
	htdocs/langs/ja_JP/bookmarks.lang
	htdocs/langs/ja_JP/boxes.lang
	htdocs/langs/ja_JP/cashdesk.lang
	htdocs/langs/ja_JP/categories.lang
	htdocs/langs/ja_JP/commercial.lang
	htdocs/langs/ja_JP/companies.lang
	htdocs/langs/ja_JP/compta.lang
	htdocs/langs/ja_JP/contracts.lang
	htdocs/langs/ja_JP/deliveries.lang
	htdocs/langs/ja_JP/dict.lang
	htdocs/langs/ja_JP/donations.lang
	htdocs/langs/ja_JP/ecm.lang
	htdocs/langs/ja_JP/errors.lang
	htdocs/langs/ja_JP/exports.lang
	htdocs/langs/ja_JP/externalsite.lang
	htdocs/langs/ja_JP/ftp.lang
	htdocs/langs/ja_JP/help.lang
	htdocs/langs/ja_JP/install.lang
	htdocs/langs/ja_JP/interventions.lang
	htdocs/langs/ja_JP/languages.lang
	htdocs/langs/ja_JP/ldap.lang
	htdocs/langs/ja_JP/mails.lang
	htdocs/langs/ja_JP/main.lang
	htdocs/langs/ja_JP/members.lang
	htdocs/langs/ja_JP/orders.lang
	htdocs/langs/ja_JP/oscommerce.lang
	htdocs/langs/ja_JP/other.lang
	htdocs/langs/ja_JP/paybox.lang
	htdocs/langs/ja_JP/paypal.lang
	htdocs/langs/ja_JP/products.lang
	htdocs/langs/ja_JP/projects.lang
	htdocs/langs/ja_JP/propal.lang
	htdocs/langs/ja_JP/sendings.lang
	htdocs/langs/ja_JP/shop.lang
	htdocs/langs/ja_JP/sms.lang
	htdocs/langs/ja_JP/stocks.lang
	htdocs/langs/ja_JP/suppliers.lang
	htdocs/langs/ja_JP/trips.lang
	htdocs/langs/ja_JP/users.lang
	htdocs/langs/ja_JP/withdrawals.lang
	htdocs/langs/ja_JP/workflow.lang
	htdocs/langs/nb_NO/agenda.lang
	htdocs/langs/nb_NO/banks.lang
	htdocs/langs/nb_NO/bookmarks.lang
	htdocs/langs/nb_NO/boxes.lang
	htdocs/langs/nb_NO/cashdesk.lang
	htdocs/langs/nb_NO/categories.lang
	htdocs/langs/nb_NO/commercial.lang
	htdocs/langs/nb_NO/companies.lang
	htdocs/langs/nb_NO/compta.lang
	htdocs/langs/nb_NO/contracts.lang
	htdocs/langs/nb_NO/deliveries.lang
	htdocs/langs/nb_NO/dict.lang
	htdocs/langs/nb_NO/donations.lang
	htdocs/langs/nb_NO/errors.lang
	htdocs/langs/nb_NO/exports.lang
	htdocs/langs/nb_NO/externalsite.lang
	htdocs/langs/nb_NO/ftp.lang
	htdocs/langs/nb_NO/help.lang
	htdocs/langs/nb_NO/install.lang
	htdocs/langs/nb_NO/interventions.lang
	htdocs/langs/nb_NO/languages.lang
	htdocs/langs/nb_NO/ldap.lang
	htdocs/langs/nb_NO/mails.lang
	htdocs/langs/nb_NO/main.lang
	htdocs/langs/nb_NO/members.lang
	htdocs/langs/nb_NO/orders.lang
	htdocs/langs/nb_NO/paybox.lang
	htdocs/langs/nb_NO/paypal.lang
	htdocs/langs/nb_NO/projects.lang
	htdocs/langs/nb_NO/propal.lang
	htdocs/langs/nb_NO/sendings.lang
	htdocs/langs/nb_NO/sms.lang
	htdocs/langs/nb_NO/stocks.lang
	htdocs/langs/nb_NO/suppliers.lang
	htdocs/langs/nb_NO/trips.lang
	htdocs/langs/nb_NO/users.lang
	htdocs/langs/nb_NO/withdrawals.lang
	htdocs/langs/nb_NO/workflow.lang
	htdocs/langs/nl_NL/propal.lang
	htdocs/langs/nl_NL/workflow.lang
	htdocs/langs/pl_PL/agenda.lang
	htdocs/langs/pl_PL/banks.lang
	htdocs/langs/pl_PL/bookmarks.lang
	htdocs/langs/pl_PL/boxes.lang
	htdocs/langs/pl_PL/cashdesk.lang
	htdocs/langs/pl_PL/categories.lang
	htdocs/langs/pl_PL/commercial.lang
	htdocs/langs/pl_PL/companies.lang
	htdocs/langs/pl_PL/compta.lang
	htdocs/langs/pl_PL/contracts.lang
	htdocs/langs/pl_PL/deliveries.lang
	htdocs/langs/pl_PL/dict.lang
	htdocs/langs/pl_PL/donations.lang
	htdocs/langs/pl_PL/errors.lang
	htdocs/langs/pl_PL/exports.lang
	htdocs/langs/pl_PL/externalsite.lang
	htdocs/langs/pl_PL/ftp.lang
	htdocs/langs/pl_PL/install.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pl_PL/languages.lang
	htdocs/langs/pl_PL/mails.lang
	htdocs/langs/pl_PL/members.lang
	htdocs/langs/pl_PL/orders.lang
	htdocs/langs/pl_PL/other.lang
	htdocs/langs/pl_PL/paybox.lang
	htdocs/langs/pl_PL/paypal.lang
	htdocs/langs/pl_PL/projects.lang
	htdocs/langs/pl_PL/propal.lang
	htdocs/langs/pl_PL/sendings.lang
	htdocs/langs/pl_PL/sms.lang
	htdocs/langs/pl_PL/stocks.lang
	htdocs/langs/pl_PL/suppliers.lang
	htdocs/langs/pl_PL/trips.lang
	htdocs/langs/pl_PL/users.lang
	htdocs/langs/pl_PL/withdrawals.lang
	htdocs/langs/pl_PL/workflow.lang
	htdocs/langs/pt_PT/cashdesk.lang
	htdocs/langs/ro_RO/agenda.lang
	htdocs/langs/ro_RO/banks.lang
	htdocs/langs/ro_RO/bookmarks.lang
	htdocs/langs/ro_RO/boxes.lang
	htdocs/langs/ro_RO/cashdesk.lang
	htdocs/langs/ro_RO/commercial.lang
	htdocs/langs/ro_RO/companies.lang
	htdocs/langs/ro_RO/compta.lang
	htdocs/langs/ro_RO/contracts.lang
	htdocs/langs/ro_RO/deliveries.lang
	htdocs/langs/ro_RO/dict.lang
	htdocs/langs/ro_RO/donations.lang
	htdocs/langs/ro_RO/errors.lang
	htdocs/langs/ro_RO/exports.lang
	htdocs/langs/ro_RO/externalsite.lang
	htdocs/langs/ro_RO/interventions.lang
	htdocs/langs/ro_RO/languages.lang
	htdocs/langs/ro_RO/mails.lang
	htdocs/langs/ro_RO/main.lang
	htdocs/langs/ro_RO/members.lang
	htdocs/langs/ro_RO/orders.lang
	htdocs/langs/ro_RO/other.lang
	htdocs/langs/ro_RO/paybox.lang
	htdocs/langs/ro_RO/paypal.lang
	htdocs/langs/ro_RO/projects.lang
	htdocs/langs/ro_RO/propal.lang
	htdocs/langs/ro_RO/sendings.lang
	htdocs/langs/ro_RO/sms.lang
	htdocs/langs/ro_RO/stocks.lang
	htdocs/langs/ro_RO/suppliers.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/langs/ro_RO/users.lang
	htdocs/langs/ro_RO/withdrawals.lang
	htdocs/langs/ro_RO/workflow.lang
	htdocs/langs/ru_RU/agenda.lang
	htdocs/langs/ru_RU/bills.lang
	htdocs/langs/ru_RU/bookmarks.lang
	htdocs/langs/ru_RU/boxes.lang
	htdocs/langs/ru_RU/companies.lang
	htdocs/langs/ru_RU/compta.lang
	htdocs/langs/ru_RU/contracts.lang
	htdocs/langs/ru_RU/errors.lang
	htdocs/langs/ru_RU/exports.lang
	htdocs/langs/ru_RU/externalsite.lang
	htdocs/langs/ru_RU/install.lang
	htdocs/langs/ru_RU/mails.lang
	htdocs/langs/ru_RU/main.lang
	htdocs/langs/ru_RU/members.lang
	htdocs/langs/ru_RU/orders.lang
	htdocs/langs/ru_RU/paybox.lang
	htdocs/langs/ru_RU/paypal.lang
	htdocs/langs/ru_RU/propal.lang
	htdocs/langs/ru_RU/stocks.lang
	htdocs/langs/ru_UA/main.lang
	htdocs/langs/sl_SI/agenda.lang
	htdocs/langs/sl_SI/boxes.lang
	htdocs/langs/sl_SI/cashdesk.lang
	htdocs/langs/sl_SI/companies.lang
	htdocs/langs/sl_SI/compta.lang
	htdocs/langs/sl_SI/contracts.lang
	htdocs/langs/sl_SI/dict.lang
	htdocs/langs/sl_SI/errors.lang
	htdocs/langs/sl_SI/exports.lang
	htdocs/langs/sl_SI/externalsite.lang
	htdocs/langs/sl_SI/install.lang
	htdocs/langs/sl_SI/languages.lang
	htdocs/langs/sl_SI/mails.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/sl_SI/members.lang
	htdocs/langs/sl_SI/orders.lang
	htdocs/langs/sl_SI/paybox.lang
	htdocs/langs/sl_SI/paypal.lang
	htdocs/langs/sl_SI/propal.lang
	htdocs/langs/sl_SI/sendings.lang
	htdocs/langs/sl_SI/stocks.lang
	htdocs/langs/sl_SI/suppliers.lang
	htdocs/langs/sv_SE/admin.lang
	htdocs/langs/sv_SE/agenda.lang
	htdocs/langs/sv_SE/banks.lang
	htdocs/langs/sv_SE/bookmarks.lang
	htdocs/langs/sv_SE/boxes.lang
	htdocs/langs/sv_SE/cashdesk.lang
	htdocs/langs/sv_SE/categories.lang
	htdocs/langs/sv_SE/commercial.lang
	htdocs/langs/sv_SE/companies.lang
	htdocs/langs/sv_SE/compta.lang
	htdocs/langs/sv_SE/contracts.lang
	htdocs/langs/sv_SE/deliveries.lang
	htdocs/langs/sv_SE/dict.lang
	htdocs/langs/sv_SE/donations.lang
	htdocs/langs/sv_SE/ecm.lang
	htdocs/langs/sv_SE/errors.lang
	htdocs/langs/sv_SE/exports.lang
	htdocs/langs/sv_SE/externalsite.lang
	htdocs/langs/sv_SE/ftp.lang
	htdocs/langs/sv_SE/help.lang
	htdocs/langs/sv_SE/install.lang
	htdocs/langs/sv_SE/interventions.lang
	htdocs/langs/sv_SE/languages.lang
	htdocs/langs/sv_SE/ldap.lang
	htdocs/langs/sv_SE/mails.lang
	htdocs/langs/sv_SE/main.lang
	htdocs/langs/sv_SE/members.lang
	htdocs/langs/sv_SE/orders.lang
	htdocs/langs/sv_SE/oscommerce.lang
	htdocs/langs/sv_SE/other.lang
	htdocs/langs/sv_SE/paybox.lang
	htdocs/langs/sv_SE/paypal.lang
	htdocs/langs/sv_SE/products.lang
	htdocs/langs/sv_SE/projects.lang
	htdocs/langs/sv_SE/propal.lang
	htdocs/langs/sv_SE/sendings.lang
	htdocs/langs/sv_SE/shop.lang
	htdocs/langs/sv_SE/sms.lang
	htdocs/langs/sv_SE/stocks.lang
	htdocs/langs/sv_SE/suppliers.lang
	htdocs/langs/sv_SE/trips.lang
	htdocs/langs/sv_SE/users.lang
	htdocs/langs/sv_SE/withdrawals.lang
	htdocs/langs/sv_SE/workflow.lang
	htdocs/langs/tr_TR/donations.lang
	htdocs/langs/tr_TR/ldap.lang
	htdocs/langs/tr_TR/oscommerce.lang
	htdocs/langs/tr_TR/paybox.lang
	htdocs/langs/tr_TR/paypal.lang
	htdocs/langs/tr_TR/shop.lang
	htdocs/langs/tr_TR/trips.lang
	htdocs/langs/zh_CN/agenda.lang
	htdocs/langs/zh_CN/banks.lang
	htdocs/langs/zh_CN/bookmarks.lang
	htdocs/langs/zh_CN/boxes.lang
	htdocs/langs/zh_CN/cashdesk.lang
	htdocs/langs/zh_CN/commercial.lang
	htdocs/langs/zh_CN/companies.lang
	htdocs/langs/zh_CN/compta.lang
	htdocs/langs/zh_CN/contracts.lang
	htdocs/langs/zh_CN/deliveries.lang
	htdocs/langs/zh_CN/dict.lang
	htdocs/langs/zh_CN/donations.lang
	htdocs/langs/zh_CN/ecm.lang
	htdocs/langs/zh_CN/errors.lang
	htdocs/langs/zh_CN/exports.lang
	htdocs/langs/zh_CN/externalsite.lang
	htdocs/langs/zh_CN/ftp.lang
	htdocs/langs/zh_CN/install.lang
	htdocs/langs/zh_CN/interventions.lang
	htdocs/langs/zh_CN/languages.lang
	htdocs/langs/zh_CN/mails.lang
	htdocs/langs/zh_CN/main.lang
	htdocs/langs/zh_CN/members.lang
	htdocs/langs/zh_CN/orders.lang
	htdocs/langs/zh_CN/oscommerce.lang
	htdocs/langs/zh_CN/paybox.lang
	htdocs/langs/zh_CN/paypal.lang
	htdocs/langs/zh_CN/projects.lang
	htdocs/langs/zh_CN/propal.lang
	htdocs/langs/zh_CN/sendings.lang
	htdocs/langs/zh_CN/shop.lang
	htdocs/langs/zh_CN/sms.lang
	htdocs/langs/zh_CN/stocks.lang
	htdocs/langs/zh_CN/suppliers.lang
	htdocs/langs/zh_CN/trips.lang
	htdocs/langs/zh_CN/users.lang
	htdocs/langs/zh_CN/withdrawals.lang
	htdocs/langs/zh_CN/workflow.lang
	htdocs/langs/zh_TW/banks.lang
	htdocs/langs/zh_TW/bookmarks.lang
	htdocs/langs/zh_TW/boxes.lang
	htdocs/langs/zh_TW/cashdesk.lang
	htdocs/langs/zh_TW/deliveries.lang
	htdocs/langs/zh_TW/ecm.lang
	htdocs/langs/zh_TW/externalsite.lang
	htdocs/langs/zh_TW/oscommerce.lang
	htdocs/langs/zh_TW/paypal.lang
	htdocs/langs/zh_TW/shop.lang
	htdocs/langs/zh_TW/sms.lang
	htdocs/langs/zh_TW/trips.lang
	htdocs/langs/zh_TW/withdrawals.lang
	htdocs/langs/zh_TW/workflow.lang
	scripts/invoices/email_unpaid_invoices_to_customers.php
	scripts/members/sync_members_ldap2dolibarr.php
 2013-07-24 15:51:50 +02:00
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
 2013-07-24 15:25:00 +02:00
Florian Henry
0ce833d282 Fix bug export contact extrafields 2013-07-24 15:19:05 +02:00
Juanjo Menent
9babb6cc4a Merge pull request #1129 from FHenry/3.4 
Fix bug export contact extrafields
 2013-07-24 06:18:00 -07:00
Laurent Destailleur
7cf429d238 Fix: Color change on page break. 2013-07-24 15:04:09 +02:00
Laurent Destailleur
cc83ad0b0e Merge remote-tracking branch 'origin/3.4' into develop 2013-07-24 14:15:35 +02:00
Florian Henry
f11d477770 Fix bug export contact extrafields 2013-07-24 13:28:02 +02:00
Laurent Destailleur
2f2f2b66c4 Fix: creation of thumbs not working 2013-07-24 11:26:09 +02:00
BENKE Charles
34c09c3aa5 Update pdf_blochet.class.php 
add ref_ext on pdf output if not empty
 2013-07-24 11:14:38 +02:00
Laurent Destailleur
126c72ca24 Merge pull request #1127 from csalvador/taskpdffix 
fix pdf model import
 2013-07-24 01:30:55 -07:00
Laurent Destailleur
644f5149e4 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-07-24 00:42:28 +02:00
Laurent Destailleur
30cd4aeced Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-07-23 18:37:09 +02:00
Laurent Destailleur
71634a0c76 Fix: Add missing css style 2013-07-23 18:36:18 +02:00
Laurent Destailleur
91debb5b82 Merge pull request #1125 from csalvador/formfile 
added permission to the hook parameters to make it easier to check
 2013-07-23 09:32:12 -07:00
Laurent Destailleur
df27538d74 Merge pull request #1122 from FHenry/3.4 
Avoid PHP warning
 2013-07-23 09:31:16 -07:00
Laurent Destailleur
1d81d1f42c Merge pull request #1120 from defrance69/patch-7 
Update modBanque.class.php
 2013-07-23 09:30:53 -07:00
Laurent Destailleur
1596619f2d Merge pull request #1118 from csalvador/bugfix 
instanciation of Facture objects raised errors, deleted them
 2013-07-23 09:27:56 -07:00
Laurent Destailleur
ac2ba9d1f6 Merge pull request #1117 from atm-maxime/mko149 
Task 149 : # of files and notes appears in tab
 2013-07-23 09:26:59 -07:00
Cédric Salvador
35faff04e9 fix pdf model import 2013-07-23 15:59:41 +02:00
Florian Henry
6f262b3a5b Avoid PHP warning 2013-07-23 15:52:41 +02:00
Laurent Destailleur
cbeeb463e2 Fix: Missing tr line 2013-07-23 15:26:35 +02:00
Laurent Destailleur
361f3a638a Fix: W3C 2013-07-23 15:24:34 +02:00
Cédric Salvador
7bd7c5206d added permission to the hook parameters to make it easier to check 2013-07-23 11:05:46 +02:00
BENKE Charles
8c7c3f03d3 Update modBanque.class.php 
Add bordereau ref_ext fields on export
 2013-07-23 05:54:47 +02:00
Cédric Salvador
19dc3ef8da instanciation of Facture objects raised errors, deleted them 2013-07-22 11:51:29 +02:00
Juanjo Menent
e939a4d268 Merge pull request #1116 from FHenry/develop 
Add category contact into left menu entry
 2013-07-22 02:17:52 -07:00
lalaina rasamoelina
4ecc9b30a9 Delete the name of user who are disable in the creation of events 2013-07-22 11:17:45 +02:00
Florian Henry
26894d9749 Fix bug in SQL 2013-07-22 10:17:31 +02:00
Florian Henry
bbacef6815 Add category contact into left menu entry for augeria theme 2013-07-22 10:15:48 +02:00
Juanjo Menent
d7da816258 Merge pull request #1114 from defrance69/patch-5 
Update modBanque.class.php
 2013-07-22 00:05:46 -07:00
Florian Henry
1a8377d847 Add category contact into left menu entry 2013-07-21 10:47:55 +02:00
BENKE Charles
c555c17315 Update modBanque.class.php 
Add Export of check deposit / bill
 2013-07-20 23:47:37 +02:00
Maxime Kohlhaas
da3e711be7 Task 149 : fix dir on company + added # of notes and documents on supplier order, invoice and project 2013-07-20 10:54:38 +02:00
Maxime Kohlhaas
28eb9d07b2 Task 149 : add # of notes and doc in tab + have always last 3 tabs be notes, doc and info 2013-07-20 09:07:10 +02:00
Geoffrey
27e26c872e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 
Conflicts:
	ChangeLog
 2013-07-19 17:33:29 +02:00
Maxime Kohlhaas
7c24686532 Add good vars for odt generation 2013-07-19 17:27:22 +02:00
Laurent Destailleur
486920958c Fix: Restore error message, but only when required. 2013-07-19 17:19:35 +02:00
Laurent Destailleur
c7aadfcf65 Fix: syntax error 2013-07-19 17:18:44 +02:00
Laurent Destailleur
7aa5daaeaf Merge pull request #1110 from GPCsolutions/noerrorsondocuments 
Avoid printing errors on documents that are fine without
 2013-07-19 07:41:51 -07:00
Laurent Destailleur
91b51f1f58 Fix: Some td cells must not have hover styles. 2013-07-19 15:52:49 +02:00
Laurent Destailleur
ed52dd9636 New: A more responsive desgin for statistic box of home page 
Qual: Hook for statistics now match specifications.
 2013-07-19 15:29:40 +02:00
Raphaël Doursenaud
e119a5c650 Avoid printing errors on documents that are fine without 2013-07-19 15:08:30 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
3896cde299 Removed useless method. Prefer using generic method. 2013-07-19 13:38:57 +02:00
Laurent Destailleur
4d2c80a122 Merge pull request #1107 from atm-maxime/develop 
Add possibility to define dependencies between extra fields lists
 2013-07-19 04:16:27 -07:00
Laurent Destailleur
e06752bc0e Merge pull request #1105 from atm-maxime/mko149 
Task 149 : # of files and notes appears in tab
 2013-07-19 04:14:05 -07:00
Maxime Kohlhaas
efff92fe1c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-07-19 09:19:34 +02:00
Maxime Kohlhaas
01e4d905fb Start work on bank sharing for multi-company 2013-07-19 09:19:20 +02:00
Laurent Destailleur
c943ef8edb Fix: doxygen 2013-07-18 23:39:29 +02:00
Laurent Destailleur
22f57e3350 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-07-18 19:02:02 +02:00
Laurent Destailleur
a240dba290 Fix: Translation of text 2013-07-18 19:01:19 +02:00
Maxime Kohlhaas
aff2be1bc0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-07-18 17:50:51 +02:00
Maxime Kohlhaas
63e6cf5c81 Add possibility to define dependencies between extra lists 2013-07-18 17:42:09 +02:00
Laurent Destailleur
75214a6b70 New: Add graphical box for turnover and proposal 2013-07-18 16:53:31 +02:00
Maxime Kohlhaas
e0d037dae5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko149 2013-07-18 11:06:38 +02:00
Florian Henry
9d942017ee Merge remote-tracking branch 'origin/develop' into develop_T165 2013-07-18 10:56:57 +02:00
Florian Henry
d5731dd310 [ task #165 ] Add export of multiprices 2013-07-18 10:47:08 +02:00
Florian Henry
0c0a64f532 [ task #924 ] Add numbering rule on task 
[ task #925 ] Add ODT document generation for Tasks in project module
 2013-07-18 10:24:45 +02:00
Florian Henry
ee82330292 On going sync/merge from other repo 2013-07-17 19:17:54 +02:00
Florian Henry
2476e7bcaf Start functionnality 2013-07-17 18:45:58 +02:00
Laurent Destailleur
7b97214df5 Merge pull request #1096 from FHenry/develop_categorycontact 
Develop categorycontact
 2013-07-17 08:41:02 -07:00
Laurent Destailleur
df88dc2f23 Use a better variable name 2013-07-17 14:57:20 +02:00
Maxime Kohlhaas
1c4c3285e2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko149 2013-07-17 10:11:54 +02:00
Juanjo Menent
8bae6a774d Merge pull request #1095 from atm-maxime/develop 
Fix on turnover reports
 2013-07-16 23:47:56 -07:00
Florian Henry
4fee61beb0 Fix adding email into mailing module 
source_id is already added
 2013-07-16 21:34:24 +02:00
Florian Henry
e07eac9b17 [ task #519 ] Add category association with contacts 2013-07-16 21:04:58 +02:00
Maxime Kohlhaas
a6a058ddae Fix by including lib files 2013-07-16 18:45:40 +02:00
Laurent Destailleur
f564d1912e New: Add graph for supplier invoices. 
Fix: Error management into supplier invoice validation.
 2013-07-16 18:43:38 +02:00
Laurent Destailleur
efd855b186 Can replace a tag with file into parameter to ouput into list of files. 2013-07-16 17:50:12 +02:00
Maxime Kohlhaas
c0feda4921 Task 149 : added on product 2013-07-16 01:28:24 +02:00
Maxime Kohlhaas
aa8e43cd1b Task 149 : Add number of notes and attached files into tab. Started with thirdparty 2013-07-16 01:09:19 +02:00
Maxime Kohlhaas
c7f3778b90 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-07-16 00:21:06 +02:00
Laurent Destailleur
2ae1e787c9 Fix: Bad date ranges 
Conflicts:
	scripts/invoices/rebuild_merge_pdf.php
 2013-07-15 21:49:54 +02:00
Laurent Destailleur
e2b63bb8dd Fix: Bad date ranges 2013-07-15 21:47:45 +02:00
Laurent Destailleur
28c28bd217 New: Add option excludethirdparties and onlythirdparties into merge pdf 
scripts.
 2013-07-15 20:56:43 +02:00
Laurent Destailleur
dd10ff8a11 eol 2013-07-15 18:51:56 +02:00
Laurent Destailleur
17f3d98fb3 New: Add option to exclude some thirdparties 2013-07-15 18:44:59 +02:00
Laurent Destailleur
d637212dce Fix: alternative url were sometimes relative to server, sometimes to 
DOL_URL_ROOT. Fix to be always relative to DOL_URL_ROOT.
 2013-07-15 00:58:40 +02:00
Laurent Destailleur
9c9b81c981 Merge pull request #1092 from atm-maxime/mko862 
Task 862 : ODT on shipment
 2013-07-14 10:21:10 -07:00
Laurent Destailleur
001072d34c Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-14 18:43:58 +02:00
Laurent Destailleur
6a1446f4dd Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-14 16:35:02 +02:00
Maxime Kohlhaas
9e5286bce9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-07-14 13:27:41 +02:00
Laurent Destailleur
154cd1fcf9 Fix: Sort on ref for supplier invoice into ged 2013-07-14 01:10:18 +02:00
Laurent Destailleur
460778818c Fix: automatic ecm for supplier invoices 2013-07-14 01:10:11 +02:00
Laurent Destailleur
1e6171ad0e Fix: Sort on ref for supplier invoice into ged 2013-07-14 00:40:22 +02:00
Laurent Destailleur
bbe9778ced Fix: automatic ecm for supplier invoices 2013-07-14 00:09:42 +02:00
Laurent Destailleur
3a9ffb19c3 fix: eol 2013-07-13 21:14:05 +02:00
Laurent Destailleur
7cdc7c0ab2 Fix: Typo 2013-07-13 19:41:27 +02:00
Laurent Destailleur
330d2173be Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-13 15:37:30 +02:00
Laurent Destailleur
b5820315f9 Fix: Correct permissions on files 2013-07-13 10:34:19 +02:00
Laurent Destailleur
ad8904a4fb Can add a picto onto line of files list. 2013-07-12 15:10:32 +02:00
Laurent Destailleur
7cff7d3250 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-11 20:22:21 +02:00
Laurent Destailleur
2c0a01fc8c Merge remote-tracking branch 'origin/3.4' into develop 2013-07-11 17:57:06 +02:00
Maxime Kohlhaas
3c7f4a3548 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 
Conflicts:
	htdocs/admin/system/perf.php
 2013-07-11 15:55:33 +02:00
Laurent Destailleur
807cbe4163 Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE 2013-07-11 09:43:07 +02:00
Laurent Destailleur
c174be7100 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-10 22:59:39 +02:00
Laurent Destailleur
f690860aa8 Fix: Avoid duplicate div error. 2013-07-10 22:58:53 +02:00
Maxime Kohlhaas
9d931b7b05 Task # 862 : ODT templates on shipment 2013-07-10 15:54:28 +02:00
Laurent Destailleur
57dbf87d0a Just use print instead of echo, just because echo is not use anuwhere 
else.
 2013-07-10 15:45:16 +02:00
Maxime Kohlhaas
cfc999a06d Merge 2013-07-10 15:44:53 +02:00
Laurent Destailleur
7ee23a9612 Merge pull request #1085 from csalvador/form_attach_new_file_hook 
hook in form_attach_new_file(html.formfile.class.php)
 2013-07-10 06:42:37 -07:00
Cédric Salvador
9619b09e37 rewriting to fit the new way to use hooks 2013-07-10 15:30:49 +02:00
Laurent Destailleur
a4abfe1abc New: Can add an event automatically when a projet is create. 2013-07-10 14:46:16 +02:00
Florian Henry
44cd024f89 Fix bug on from_confrim using ajax and radio button question type 2013-07-10 13:10:32 +02:00
Laurent Destailleur
fbf6f150bc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-09 21:41:05 +02:00
Laurent Destailleur
f67e52f42a Start to clean hook code 2013-07-09 21:40:45 +02:00
Laurent Destailleur
1bff25bf28 Start to clean hookmanager code. 2013-07-09 21:33:45 +02:00
Cédric Salvador
03ad72a1fa fix dol_buildpath failing when processing path such as file.php?id=__ID__ 2013-07-09 18:14:50 +02:00
Cédric Salvador
2fc07d05e9 hook in form_attach_new_file(html.formfile.class.php) 2013-07-09 18:12:43 +02:00
Laurent Destailleur
0ca4e4ffe8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-07-09 13:51:27 +02:00
Laurent Destailleur
5706779c8b New: Add a page on performance advice 2013-07-09 13:50:20 +02:00
Laurent Destailleur
c1cb5e9bff Fix geoipmaxmind module 2013-07-09 00:19:58 +02:00
Florian Henry
3db195cb48 [ bug #971 ] html.form.class.php select_contact with autocomplete do not 
exclude id from exclude array
 2013-07-08 12:51:17 +02:00
Florian Henry
b1b68eafe3 [ bug #972 ] Auto completion contact field do not take account the min 
caract number before search
 2013-07-08 12:47:07 +02:00
Laurent Destailleur
b26250c45a Fix when alt path is full url instead of relative. 2013-07-07 23:37:56 +02:00
Laurent Destailleur
7c163f7be3 Fix: Running fixdosfile onto all project 2013-07-07 13:17:48 +02:00
Laurent Destailleur
2bc650bf61 Qual: Remove tons of codesniffer errors and warnings. 2013-07-07 13:14:32 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative 
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
 2013-07-07 03:26:51 +02:00
Laurent Destailleur
5385d87995 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/ca_ES/errors.lang
	htdocs/langs/ca_ES/main.lang
	htdocs/langs/ca_ES/opensurvey.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/ca_ES/products.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/products.lang
 2013-07-05 21:56:54 +02:00
Laurent Destailleur
879cfbbdf3 Merge pull request #1080 from defrance69/patch-4 
Update modFacture.class.php
 2013-07-05 05:59:19 -07:00
Laurent Destailleur
2cdf621b75 New: Provide relativepath as parameter 2013-07-05 14:55:24 +02:00
BENKE Charles
45e32ca3a5 Update modFacture.class.php 
add 'accountancy_code_sell' to the customer invoice export list
 2013-07-05 12:14:27 +02:00
Laurent Destailleur
7cb8809669 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-04 00:12:23 +02:00
Laurent Destailleur
eef039e02f New: [ task #286 ] Enhance rounding function of prices to allow round of 
sum instead of sum of rounding
 2013-07-04 00:11:40 +02:00
Regis Houssin
7e70d935b6 Fix: change for use url of image 2013-07-03 16:07:31 +02:00
Regis Houssin
a9198e66eb Fix: change for use url of image 2013-07-03 16:06:42 +02:00
Laurent Destailleur
6f5a918373 New: Add option MAIN_MOTD_SETUPPAGE to add a content onto setup page. 
Also content for MAIN_MOTD_SETUPPAGE, MAIN_MOTD_SETUPPAGE, MAIN_HOME
now accept "|langfile" into translation key to use a specific language
file.
 2013-07-02 21:53:34 +02:00
Laurent Destailleur
1beb50e870 Fix: State for turkey 2013-07-02 09:58:09 +02:00
Raphaël Doursenaud
b9ff5188b3 Normalized EOL 2013-07-01 12:00:42 +02:00
Laurent Destailleur
134187ef94 Fix: Overlapping of company name. 
Fix: Missing state for ome countries.
 2013-07-01 00:08:44 +02:00
Laurent Destailleur
10e28fa27a Fix: Overlapping of company name. 
Fix: Missing state for ome countries.
 2013-07-01 00:05:39 +02:00
Laurent Destailleur
387c213aea New: Add box for graph of customer orders 2013-06-30 23:01:28 +02:00
Laurent Destailleur
4b00da5fa8 Work on boxes with graph 2013-06-29 02:23:23 +02:00
Laurent Destailleur
d8883dba7f New: Add new graphical boxes (customer invoices per month). 2013-06-28 19:19:18 +02:00
Laurent Destailleur
4f84b1e774 Fix: Bad error management 2013-06-28 17:55:48 +02:00
Laurent Destailleur
1afef513b1 Fix: Bad error management 2013-06-28 17:44:34 +02:00
Laurent Destailleur
c276283d9f New: Add errorsToString function 2013-06-28 12:44:17 +02:00
Laurent Destailleur
314d45a9ee Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/it_IT/admin.lang
	htdocs/langs/nb_NO/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/pt_BR/admin.lang
	htdocs/langs/pt_PT/admin.lang
	htdocs/langs/sl_SI/admin.lang
	htdocs/langs/zh_TW/admin.lang
 2013-06-28 00:52:09 +02:00
Laurent Destailleur
dc22b5a50a Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/mailings/modules_mailings.php
 2013-06-28 00:24:13 +02:00
Laurent Destailleur
7e74d9890b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-06-27 17:47:03 +02:00
Laurent Destailleur
c92aa1f6aa New: dol_strintotime accept format YYYY-MM-DD HH:MM:SS 
Fix: create member was missing field import_key
New: Uniformize code
 2013-06-27 17:45:58 +02:00
Florian Henry
469e700895 Fix bug pgsql : add mail directly into mailling 2013-06-27 14:35:41 +02:00
jfefe
b513bd7b84 Fix : bad element type name for company extrafields into export 2013-06-27 14:30:49 +02:00
jfefe
162fc6e6dd Remove debug info 2013-06-27 13:45:06 +02:00
jfefe
2f6361658a Can choose several fields to display with extrafield list of table 2013-06-27 13:35:28 +02:00
Laurent Destailleur
b5b07f8a14 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-26 16:46:01 +02:00
Laurent Destailleur
696ad07871 LF 2013-06-26 16:45:42 +02:00
Laurent Destailleur
58bdac2dcd Merge pull request #1066 from atm-maxime/develop 
Add search on siren (idprof1)
 2013-06-26 07:41:07 -07:00
Cédric Salvador
117ddbdff2 add columns if active hooks use the formBuilddocLineOptions method 2013-06-26 15:20:42 +02:00
Cédric Salvador
bfedddd95e init hook 2013-06-26 15:20:16 +02:00
Cédric Salvador
df94f3816c add hook to add line options in html.formfile.class.php 2013-06-26 15:19:59 +02:00
Laurent Destailleur
9a5b55219a Fix: CSS 2013-06-26 14:40:29 +02:00
Laurent Destailleur
1de8ab3785 Fix: CSS 2013-06-26 14:38:56 +02:00
Laurent Destailleur
9b235f6879 Fix: Remove space at end of binary files 2013-06-26 02:05:18 +02:00
Laurent Destailleur
af4651f1a2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php
 2013-06-25 23:22:00 +02:00
Laurent Destailleur
8359a34545 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	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/compta/facture/class/facture-rec.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
 2013-06-25 21:31:24 +02:00
Laurent Destailleur
2af8f295b1 Fix: warning not always visible. Depends if addon modules were 
installed. Var should provide a quick fix.
 2013-06-25 21:25:09 +02:00
Laurent Destailleur
0ec4b3bcdb Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-25 18:10:55 +02:00
Laurent Destailleur
285ea8da3f More info into log 2013-06-25 15:47:59 +02:00
jfefe
54bf3fd516 Add parameter to force user in dol_check_access_document function 
This required by webservice where global $user is not available
 2013-06-25 15:09:51 +02:00
Laurent Destailleur
c2654fa7e2 Fix: Bad translation. Must use a different string than products 2013-06-25 15:00:10 +02:00
Maxime Kohlhaas
76870622e4 Add turnover report by product / serv 2013-06-25 14:54:29 +02:00
simnandez
ca190be382 [Bug #958] LocalTax2 for Spain fails on Suppliers 2013-06-25 11:21:56 +02:00
simnandez
065b30f0d0 [Bug #958] LocalTax2 for Spain fails on Suppliers 2013-06-25 11:12:21 +02:00
Laurent Destailleur
1d8b9949d6 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php
 2013-06-24 20:02:02 +02:00
Laurent Destailleur
f8f0b08bfc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-06-24 18:33:00 +02:00
Laurent Destailleur
a8547b5375 New: Add property hidden into module descriptor to allow to hide a 
module according to some dynamic conditions.
 2013-06-24 18:31:56 +02:00
Regis Houssin
4cd6ae6bbd Fix: convert lines delimiters 2013-06-24 17:36:33 +02:00
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