lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,044 Commits 43 Branches 150 Tags 886 MiB
3.6.0-alpha
Commit Graph

35302 Commits

Author SHA1 Message Date
Christophe Battarel
0bdcd108f5 Add supplier informations in product export (supplier name, supplier product ref and supplier unit price) 2014-01-16 11:04:56 +01:00
Laurent Destailleur
c5bcc92651 Rename tag note to differentiate public and private note 2014-01-16 00:07:45 +01:00
Laurent Destailleur
b3229a4021 Qual: Add error message if using wrong parameter into upgrade.php script 
First try to test migration into travis.
 2014-01-15 19:23:33 +01:00
Laurent Destailleur
d72167d543 Code comments 2014-01-15 19:12:55 +01:00
Laurent Destailleur
aa69927089 Move table title nowrap tag at a better place. 2014-01-15 18:35:15 +01:00
Laurent Destailleur
ad5fc43e5b doxygen 2014-01-15 18:20:24 +01:00
Laurent Destailleur
b5620d5f15 New: The box "balance of bank accounts" show all opened accounts. 2014-01-15 17:52:16 +01:00
Laurent Destailleur
fce9baddf0 New: Add substitution key into emailing module to include securitykey 
used for paypal links into email.
 2014-01-15 17:21:13 +01:00
Laurent Destailleur
6a95f73036 Fix: Missing translation key 2014-01-15 16:14:34 +01:00
Laurent Destailleur
af4d48aec0 Fix: If end date is not defined, we can't say it is too late. 2014-01-15 15:42:14 +01:00
Alexis Algoud
9a5b46330a Add right to export project in export tool 
As the right does not exist, the tool could never be exploited
 2014-01-15 14:49:22 +01:00
Laurent Destailleur
b9be26f9f1 Fix: favicon was old file. 
Fix: missing favicon for theme auguria
 2014-01-15 09:24:53 +01:00
Laurent Destailleur
fed3ac9b70 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2014-01-15 09:10:30 +01:00
Laurent Destailleur
8de8e9d886 Fix: reference to a file that does not exists 2014-01-15 09:09:52 +01:00
Laurent Destailleur
0725fea923 Fix: doxygen 2014-01-15 03:08:11 +01:00
Laurent Destailleur
ac45051b53 Fix: Showing version is wrong when replace by external module 2014-01-15 02:04:44 +01:00
Laurent Destailleur
fa1c88d80b Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-01-14 22:18:57 +01:00
Laurent Destailleur
4f1df33e51 Fix: thumb image was not up to date compared to new skin. 2014-01-14 22:18:44 +01:00
Laurent Destailleur
3a246bdca9 Merge pull request #1377 from csalvador/containsObject 
add a method to check for the presence of an object in a category
 2014-01-14 09:11:47 -08:00
Laurent Destailleur
12ee5dece2 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-14 18:10:14 +01:00
Cedric GROSS
6d4a9833e2 Fix bug on stock calculation for replenishment: wrong order in ifsql. 2014-01-14 18:08:26 +01:00
Laurent Destailleur
c704182b4d Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2014-01-14 18:01:39 +01:00
Laurent Destailleur
bd1a10c116 Fix: doxygen 2014-01-14 16:49:06 +01:00
Cedric GROSS
911c43c862 Fix bug on stock calculation for replenishment: wrong order in ifsql. 2014-01-13 19:46:23 +01:00
Grand Philippe
b61ccb8234 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 10:15:07 +01:00
Grand Philippe
462f65614d Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 10:10:17 +01:00
Grand Philippe
c5689b86b4 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 09:43:21 +01:00
Cédric Salvador
ecfff5636b rename is_in_cat to containsObject 2014-01-13 09:27:10 +01:00
Cédric Salvador
abe76708de renamed object_exists 2014-01-13 09:06:00 +01:00
Cédric Salvador
e7f7dd49a5 add a method to check for the presence of an object in a category 2014-01-13 09:06:00 +01:00
philippe
9bada81b63 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-13 08:47:57 +01:00
Laurent Destailleur
795dcad59f Fix: The login page should have same code than standard page using 
common footer.
 2014-01-12 22:26:48 +01:00
Grand Philippe
938f31f383 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1. 2014-01-12 21:45:52 +01:00
philippe
d2d84c3e48 Fix: path to image must not be hardcoded but use dol_buildpath or 
img_picto with param src=1.
 2014-01-12 21:26:44 +01:00
Laurent Destailleur
5f65b2a97f Merge remote-tracking branch 'origin/3.5' into develop 2014-01-12 20:23:24 +01:00
Laurent Destailleur
0f329e72ef Fix: MAIN_FORCETHEME was not working when user set its own theme 2014-01-12 20:22:35 +01:00
Laurent Destailleur
4d298b1891 Update code comments and add log warning to help debug 2014-01-12 20:03:18 +01:00
Laurent Destailleur
0990ef3961 Update code comments and add log warning to help debug 2014-01-12 20:02:41 +01:00
Laurent Destailleur
ffeb2778e5 Fix: path to image must not be hardcoded but use dol_buildpath or 
img_picto with param src=1.
 2014-01-12 19:23:36 +01:00
Laurent Destailleur
51b455b85a Start to normalize code for category to not use named table, columns but 
only type of category.
 2014-01-12 15:54:28 +01:00
Laurent Destailleur
1cf058b8e9 Bad comment 2014-01-12 15:12:25 +01:00
BENKE Charles
28204d66b1 Update modFacture.class.php 
remplace price by subprice on export invoice
 2014-01-12 14:59:23 +01:00
Laurent Destailleur
77688100bd Merge pull request #1372 from defrance69/patch-23 
Update modFacture.class.php
 2014-01-12 05:58:04 -08:00
Laurent Destailleur
06aa3b8250 Merge branch 'opensurvey-improvements' of 
https://github.com/marcosgdf/dolibarr into
marcosgdf-opensurvey-improvements

Conflicts:
	ChangeLog
 2014-01-12 14:50:00 +01:00
Laurent Destailleur
02989b9f32 New: An external module can add tabs with a label that is a dynamic 
value.
Qual: The deprecated way (with 4 parameters) to declare a new tab into a
module descriptor file has been removed. You must now use the 6
parameters way. See file modMyModule.class.php for example.
 2014-01-12 14:11:03 +01:00
Raphaël Doursenaud
78b40eaa8c Handle default session path nicely 2014-01-11 17:30:29 +01:00
Laurent Destailleur
23eb0f3770 Qual: Mutualize code for actions of editing notes 
New: Add button 'cancel' to cancel edition of a note (private or public)
 2014-01-11 13:33:30 +01:00
Laurent Destailleur
171e74ae7e Reduce time to hide/show 2014-01-11 13:31:12 +01:00
Laurent Destailleur
db5fe44b93 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2014-01-10 16:48:56 +01:00
BENKE Charles
dd3da37ce6 Update modFacture.class.php 
remplace price by subprice on export invoice
 2014-01-10 10:35:42 +01:00
Laurent Destailleur
5bdd7fc074 Fix: Doxygen 2014-01-10 03:39:43 +01:00
Laurent Destailleur
45b3a02e8b Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-01-10 01:37:58 +01:00
Laurent Destailleur
2c310e26a6 Fix: Missing lang file 2014-01-10 01:37:41 +01:00
Laurent Destailleur
9b9492a5d6 New: Start to work on option MAIN_AUTO_TIMESTAMP_IN_NOTES to 
automatically add timestamp and user line into comment. Remain to do:
Add button "cancel" into note edition mode.
 2014-01-10 01:31:23 +01:00
Laurent Destailleur
c3da8ca80a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-01-10 01:25:55 +01:00
Laurent Destailleur
7809e0baa9 Fix: dol_htmlentitiesbr behaviour was different if input was html 
or not. Add phpunit test to avoid that in future.
 2014-01-10 01:25:28 +01:00
Laurent Destailleur
7b63ce1f31 Doxygen 2014-01-10 00:57:17 +01:00
Laurent Destailleur
374be1854e Fix: Bad url 2014-01-09 23:12:28 +01:00
Laurent Destailleur
eae92695d6 Fix: Warning into bank conciliation feature. 2014-01-09 18:47:33 +01:00
Maxime Kohlhaas
364085bd20 Fix : wrong var used in bank account class 2014-01-09 18:42:35 +01:00
Laurent Destailleur
0b071ac4f1 Merge pull request #1369 from jfefe/fix_extrafield_list 
Fix : when using several field for label into sellist extrafields
 2014-01-09 06:41:27 -08:00
Laurent Destailleur
08e4dc29de Merge pull request #1370 from jfefe/ajax_extralist 
New : ajax list for extrafields list and sellist
 2014-01-09 06:39:22 -08:00
Laurent Destailleur
dce76609e3 Merge pull request #1365 from marcosgdf/translation 
Added missing translation key
 2014-01-09 06:33:02 -08:00
Laurent Destailleur
433a6c0e76 Merge pull request #1364 from marcosgdf/xss-title 
Fixed XSS problem in title tag
 2014-01-09 06:32:35 -08:00
Laurent Destailleur
d76f54757b Merge pull request #1367 from camlafit/odt2pdf 
Small improves on odt2pdf script
 2014-01-09 06:31:35 -08:00
Laurent Destailleur
511a44a7e6 Merge pull request #1368 from csalvador/webservices-debug 
fixed wrong thumbnails directory
 2014-01-09 06:28:53 -08:00
Laurent Destailleur
2b4f0bd4b1 Fix: Add a limit into list to avoid browser to hang when database is too 
large.
 2014-01-09 14:28:32 +01:00
Cédric Salvador
e959568a1d Added details to the contact created by create_individual 2014-01-09 09:10:50 +01:00
jfefe
77a1d6a43a Bad value display when using several label into sellist extrafield 2014-01-09 02:40:34 +01:00
jfefe
f554464690 New : ajax list for extrafields list and sellist 2014-01-09 02:10:03 +01:00
jfefe
f1d1522478 Fix : when using several field for label into sellist extrafields traduction is not needed. 
Without this, the list display "not defined". The key can't exists because label displayed is build from several field so we show raw data
 2014-01-09 01:49:59 +01:00
Laurent Destailleur
63ecb859d6 Fix: Missing alias befofe field into sql request and removed bad join on 
table making some record to disappear.
 2014-01-08 20:50:04 +01:00
Laurent Destailleur
855487a384 Fix: Missing alias befofe field into sql request and removed bad join on 
table making some record to disappear.
 2014-01-08 20:40:30 +01:00
Laurent Destailleur
fac3593f7c Missing lang file 2014-01-08 15:50:11 +01:00
Laurent Destailleur
c0c555b78f Fix: A lot of fix into sticker sheet dimension management. 
Fix: Size of font too large to print sticker pages.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
 2014-01-08 15:16:56 +01:00
Laurent Destailleur
622fe72abf Fix: A lot of fix into sticker sheet dimension management. 
Fix: Size of font too large to print sticker pages.
 2014-01-08 15:13:41 +01:00
Laurent Destailleur
6ff337ccad New: Add option 'aZ' into GETPOST function to check parameters 
contains only a to z or A to Z characters.
 2014-01-08 00:10:39 +01:00
Laurent Destailleur
77cfdfd59e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-01-08 00:05:59 +01:00
Laurent Destailleur
5f15dcded7 New: Work on a basic print barcode page 2014-01-08 00:05:42 +01:00
Laurent Destailleur
0e3757aa5c New: Add option 'az' into GETPOST 2014-01-08 00:05:14 +01:00
Laurent Destailleur
bc51065ff1 New: For paypal payment confirmation, send email ok only if payment is 
confirmed. Otherwise send ko email.
 2014-01-07 17:35:33 +01:00
Laurent Destailleur
58bc3b1457 New: For paypal payment confirmation, send email ok only if payment is 
confirmed. Otherwise send ko email.
 2014-01-07 17:34:25 +01:00
Cédric Salvador
68e42bc24e fixed wrong thumbnails directory 2014-01-07 17:26:12 +01:00
Laurent Destailleur
267716b557 Just a space between default message and setup message 2014-01-07 16:53:07 +01:00
Laurent Destailleur
c7ef0b7c57 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/societe/consumption.php
 2014-01-07 16:41:00 +01:00
Laurent Destailleur
6e5f3b8bdd Fix: entity into public pages not set at correct place 2014-01-07 16:29:25 +01:00
Laurent Destailleur
1df18f1e93 Fix: Function GETPOST not found 2014-01-07 16:11:08 +01:00
Laurent Destailleur
4d379e572a Fix: Bugs into permissions for module category 2014-01-07 15:35:26 +01:00
Laurent Destailleur
bbeff884f3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-01-07 15:12:53 +01:00
Laurent Destailleur
89c772459f Fix: Bugs into permissions for module category 2014-01-07 14:55:03 +01:00
simnandez
035670dce3 Fix: Bad get of localtaxes into contracts add lines 2014-01-07 12:18:50 +01:00
simnandez
b8550bb985 Fix: Bad get of localtaxes into contracts add lines 2014-01-07 12:16:56 +01:00
simnandez
d4db5916f0 Fix: Bad get of localtaxes into contracts add lines 2014-01-07 12:16:16 +01:00
cam.lafit
1229842dc6 Provide a new constant about odt2pdf mangement : Don't remove odt source 
* MAIN_ODT_AS_PDF_DEL_SOURCE by default disable
* If set then initial behaviour is conserved, odt file is removed
 2014-01-06 20:07:15 +01:00
Laurent Destailleur
e99883f1a6 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/admin/modules.php
 2014-01-06 19:18:06 +01:00
Laurent Destailleur
5b63b56143 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
 2014-01-06 19:13:40 +01:00
Laurent Destailleur
ab7a17fe73 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-01-06 19:12:06 +01:00
Laurent Destailleur
0e3184c436 Fix: W3C. 
Fix: Permission on a button.
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/societe/soc.php

Fix: Some menu entry not visible.
 2014-01-06 17:17:57 +01:00
Laurent Destailleur
555170e573 Fix: W3C. 
Fix: Permission on a button.
Fix: Some menu entry not visible.
 2014-01-06 17:14:13 +01:00
Laurent Destailleur
7fd34e5ff6 Fix: [ bug #1208 ] Users without read permission on the tasks can still 
see all project tasks
Fix: function clean_orhpelins was reporting wrong number of cleaned
orphelins.
 2014-01-06 13:34:26 +01:00
Laurent Destailleur
7afdad60a0 Fix: [ bug #1208 ] Users without read permission on the tasks can still 
see all project tasks
 2014-01-06 12:42:50 +01:00
Marcos García de La Fuente
2a41a29306 Fixed bad translation 2014-01-06 06:05:30 +01:00
Marcos García de La Fuente
0622fc4ffd Added missing translation key 2014-01-06 06:03:26 +01:00
Marcos García de La Fuente
fc7d3d4771 Modified migration script to not remove columns 2014-01-06 05:39:22 +01:00
Marcos García de La Fuente
55014b3338 If user does not have an email and option “Mailsonde” is active, then we show a warning 2014-01-06 05:29:07 +01:00
Marcos García de La Fuente
2c816e09a5 If no spy option is enabled, users should not now which is the most voted option 2014-01-06 05:20:08 +01:00
Marcos García de La Fuente
c245e86b60 Little changes to the opensurvey_sondage table definition 2014-01-06 05:17:02 +01:00
Marcos García de La Fuente
c2c97ec82a Mailsonde should not be a varchar 2014-01-06 05:12:47 +01:00
Marcos García de La Fuente
e09af20899 Removed unused translations from opensurvey.lang 2014-01-06 05:09:36 +01:00
Marcos García de La Fuente
dafe05d15d Fixed a problem with open survey creation trigger 2014-01-06 05:09:17 +01:00
Marcos García de La Fuente
e0c7eb545c Email and poll author are now retrieved from the logged user 2014-01-06 05:08:42 +01:00
Marcos García de La Fuente
b8b7dbbed4 Created triggers OPENSURVEY_CREATE and OPENSURVEY_DELETE 2014-01-05 22:05:56 +01:00
Marcos García de La Fuente
ff7e4e49f3 Limiting the voting time of the survey 2014-01-05 21:54:12 +01:00
Marcos García de La Fuente
aa25d2cb81 End date of the survey was altered when creating a new column in date poll format 2014-01-05 21:23:00 +01:00
Marcos García de La Fuente
45aa6767e0 Return back to the results page when a new column is created 2014-01-05 21:20:08 +01:00
Marcos García de La Fuente
e7d2765fc6 Replaced use of htmlentities with dol_htmlentities 2014-01-05 21:08:37 +01:00
Marcos García de La Fuente
b12b7d965a Fixed “cancel” button on creation in new column of standard poll type 2014-01-05 21:00:54 +01:00
Marcos García de La Fuente
224208c9bb Unified comment deletion in Opensurveysondage::deleteComment 2014-01-05 20:58:27 +01:00
Marcos García de La Fuente
1e6c0c0b1a There is no poll format A+ or D+ 2014-01-05 20:48:20 +01:00
Marcos García de La Fuente
291267953a Added a new check to don’t allow users create standard polls without any option 2014-01-05 20:46:45 +01:00
Marcos García de La Fuente
a158067150 Improved error feedback when empty required inputs are submitted 2014-01-05 20:39:53 +01:00
Marcos García de La Fuente
60cff505a7 Fixed always-checked mail when a new person votes feature 2014-01-05 20:36:40 +01:00
Marcos García de La Fuente
1afdce2c16 Cancel button when adding a new poll column was not working 2014-01-05 20:34:43 +01:00
Marcos García de La Fuente
e493348931 Removed space before colon 2014-01-05 20:30:53 +01:00
Marcos García de La Fuente
ef44db8bd8 Removed unused constants & functions and added new comment insert error message 2014-01-05 20:28:32 +01:00
Marcos García de La Fuente
b68f5b6251 Removed unexisting input checks 2014-01-05 20:21:06 +01:00
Marcos García de La Fuente
0f08fd3f06 Replaced usage of htmlentities with dol_htmlentities 2014-01-05 20:18:02 +01:00
Marcos García de La Fuente
b32fafef17 Fixed problem with visualization of previous votes in poll voting page 2014-01-05 20:10:39 +01:00
Marcos García de La Fuente
c891f4afc4 Fixed coding standard problems 2014-01-05 19:40:49 +01:00
Marcos García de La Fuente
f7809906d9 Removed massive deletion feature of polls as it is not a common case 2014-01-05 19:38:39 +01:00
Marcos García de La Fuente
f5201b97a5 The voter does not have to know which user created the poll 2014-01-05 19:15:48 +01:00
Marcos García de La Fuente
0a3a6c0f88 Restricted survey creation to $user->rights->opensurvey->write 2014-01-05 19:13:12 +01:00
Marcos García de La Fuente
048e270fec Removed odd html attributes 2014-01-05 19:09:20 +01:00
Marcos García de La Fuente
044d81b0a5 Removed unused images 2014-01-05 19:09:03 +01:00
Marcos García de La Fuente
2393e7c732 Moved creation poll wizard out of public folder 2014-01-05 19:03:33 +01:00
Marcos García de La Fuente
a5a0962dab Fixed JS errors and little style changes 2014-01-05 18:55:56 +01:00
Marcos García de La Fuente
4cdafba7a2 Removed “origin” input use in poll creation 2014-01-05 18:49:49 +01:00
Marcos García de La Fuente
adcc4090b0 Removed “today” button of expire date input in poll creation form 2014-01-05 18:46:04 +01:00
Marcos García de La Fuente
33ec281424 Removed unexisting input checks in poll creation 2014-01-05 18:44:19 +01:00
Marcos García de La Fuente
acd847c419 Fixed SQL error in opensurvey poll list 2014-01-05 18:42:30 +01:00
Marcos García de La Fuente
832fc8e0f3 Renamed NextStep button to CreatePoll 2014-01-05 18:42:08 +01:00
Marcos García de La Fuente
97bd5df498 Moved poll expiration date to first form and removed odd forms 2014-01-05 18:40:53 +01:00
Laurent Destailleur
2d8214a940 Fix: The delete button into ecm module does not work when ajax disabled. 2014-01-05 18:37:26 +01:00
Laurent Destailleur
5b40eff0fa Fix: W3C. Input fields can be between a table and tr tag. 2014-01-05 18:30:35 +01:00
Laurent Destailleur
667908baf8 Fix: Missing lang loading 2014-01-05 16:37:33 +01:00
Laurent Destailleur
283297294b Fix: Missing definition of status labels 2014-01-05 16:19:25 +01:00
Laurent Destailleur
48973c6d02 Fix: Some SQL requests were not finished into new tab "consumption". 2014-01-05 16:00:45 +01:00
Laurent Destailleur
9a6f22a86e Fix: W3C no form into table. 
Fix: Css style overflowwithjm has been superseded by
maxwidthonsmartphone
Fix: Style button disabled was not visible with jmobile
Fix: Rounding corner with jmobile
 2014-01-05 15:46:39 +01:00
Laurent Destailleur
67220a15ca Fix: Bad translation key 2014-01-05 14:13:40 +01:00
Marcos García de La Fuente
4f57e82975 Removed odd messages 2014-01-05 09:36:35 +01:00
Marcos García de La Fuente
8d96675607 Force logged user to create surveys and applied Dolibarr style to poll creation wizard 2014-01-05 09:08:42 +01:00
Marcos García de La Fuente
c86130e813 Fixed navigation arrows in poll card 2014-01-05 08:03:50 +01:00
Marcos García de La Fuente
fba3c63050 Starting to make survey creation a user-only access page 2014-01-05 07:28:04 +01:00
Marcos García de La Fuente
f8268c60d4 Removed OpenSurvey legend from public poll voting page 2014-01-05 07:16:36 +01:00
Marcos García de La Fuente
cf092834cd Renamed some file names from french to english 2014-01-05 07:08:37 +01:00
Marcos García de La Fuente
08560cbc5f Little spacing improvement 2014-01-05 07:05:04 +01:00
Marcos García de La Fuente
b2c0463cd9 Corrected little problem with XSS fix 2014-01-05 07:03:51 +01:00
Marcos García de La Fuente
abf0ec1d6a Removed unnecesary form ID 2014-01-05 06:59:38 +01:00
Marcos García de La Fuente
b699133357 Restricting deletion of polls in poll list 2014-01-05 06:50:56 +01:00
Marcos García de La Fuente
eb43a70b26 Renamed SurveyResults/Preview tab to SurveyResults as it didn’t make sense to make a “preview” of a public page 2014-01-05 06:45:53 +01:00
Marcos García de La Fuente
d76081d487 Improved feedback to the user when he did not enter name in his vote 2014-01-05 06:42:08 +01:00
Marcos García de La Fuente
67077338a0 Improved translation of opensurvey module 2014-01-05 06:37:08 +01:00
Marcos García de La Fuente
426ccb4056 Fixed another XSS in public poll vote page 2014-01-05 06:25:47 +01:00
Marcos García de La Fuente
6397b0b7aa Improving the use of permissions in opensurvey module 2014-01-05 06:18:26 +01:00
Marcos García de La Fuente
12c5a2c201 Fixed more XSS problems in opensurvey module 2014-01-05 05:27:15 +01:00
Marcos García de La Fuente
a8a2613c4a Date combo selector wasn’t translating month names 2014-01-05 05:25:32 +01:00
Marcos García de La Fuente
89c6aa2d87 Removed unused/unuseful injection checks on open survey creation 2014-01-05 05:04:41 +01:00
Marcos García de La Fuente
dd8d8e8e42 Removed unused translation strings 2014-01-05 04:59:15 +01:00
Marcos García de La Fuente
e49f94d02e Fixed XSS problem in title tag 2014-01-05 04:52:45 +01:00
Marcos García de La Fuente
d23a8ea788 Fixed big XSS problems in open survey module 2014-01-05 04:50:54 +01:00
Marcos García de La Fuente
45da8eb446 Fixed fatal error when deleting a poll 2014-01-05 04:50:37 +01:00
Laurent Destailleur
5a7fe6b4a7 Fix: Change to make debian package ok despite removal of ckeditor 
package.
 2014-01-05 01:17:38 +01:00
Marcos García de La Fuente
7fccefd620 Fixed code quality problem 2014-01-04 20:05:18 +01:00
Marcos García de La Fuente
c9db0c3a94 Removed “stupid” feature to allow voters edit other users’ vote 2014-01-04 19:51:44 +01:00
Laurent Destailleur
d2d0d715a9 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/install/mysql/data/llx_c_tva.sql
 2014-01-04 19:02:56 +01:00
Laurent Destailleur
f1120b8749 Merge pull request #1363 from atm-alexis/3.4 
New standard VAT rate for France on january, 1st, 2014
 2014-01-04 09:59:59 -08:00
Laurent Destailleur
2ee5076970 Problem of key of language into auguria menu 2014-01-04 18:57:57 +01:00
Laurent Destailleur
77e2d49658 Merge pull request #1358 from marcosgdf/payment_menu 
Fixed quality control checks for PR #1357
 2014-01-04 09:45:12 -08:00
Marcos García de La Fuente
c197fbd436 Removed unused images 2014-01-04 18:01:55 +01:00
Marcos García de La Fuente
a40286f2fc Added missing function comment 2014-01-04 17:17:25 +01:00
Laurent Destailleur
ee1e7471ff Fix: A lot of bug into generation of sticker pages or address pages 
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
 2014-01-04 16:17:47 +01:00
Laurent Destailleur
918c5ff405 Fix: A lot of bug into generation of sticker pages or address pages 
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.
 2014-01-04 16:13:34 +01:00
Marcos García de La Fuente
11dc75686f Mailsonde Opensurvey function can now be modified 2014-01-04 15:57:07 +01:00
Marcos García de La Fuente
57a18ba4af Unified duplicate code that cleaned Opensurveysondage parameters into Opensurveysondage::cleanParameters 2014-01-04 15:56:37 +01:00
Marcos García de La Fuente
efba39310e Some session variables were not properly unset 2014-01-04 15:47:47 +01:00
Marcos García de La Fuente
3590e3d7b6 Moved creation of surveys to the function Opensurveysondage::create 2014-01-04 15:42:44 +01:00
Laurent Destailleur
f6cda9deb6 Fix: The scale was hardcoded. 
Comment in english
 2014-01-04 12:40:13 +01:00
Laurent Destailleur
6c3c66c45d New: Add menu entry to barcode genration page. 2014-01-04 12:29:20 +01:00
Laurent Destailleur
bea74e54c8 Fix: The scale was hardcoded. 
Comment in english
 2014-01-04 12:26:31 +01:00
Marcos García de La Fuente
b9ec6ad637 Removed unused function opensurveysondage::createFromClone 2014-01-03 23:58:44 +01:00
Marcos García de La Fuente
13d4ea4c38 Added a new feature to disable spying other users’ vote 2014-01-03 23:30:15 +01:00
Marcos García de La Fuente
2b01981213 There is no rowid in llx_opensurvey_sondage table 2014-01-03 22:29:40 +01:00
Marcos García de La Fuente
1a038fac06 Removed the use of id_sondage_admin and survey_link_visible fields of llx_opensurvey_sondage 2014-01-03 22:13:15 +01:00
Laurent Destailleur
f0503dfaa9 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	ChangeLog
	htdocs/compta/stats/cabyprodserv.php
	htdocs/compta/stats/casoc.php
 2014-01-03 18:28:00 +01:00
Laurent Destailleur
d992d5cb22 Fix: Bad SQL request when using filter on category. 2014-01-03 18:16:21 +01:00
Marcos García de La Fuente
a5b9122e98 Allow to disable poll comments 2014-01-03 17:44:42 +01:00
Marcos García de La Fuente
8b781e46c6 Added missing copyright info 2014-01-03 16:43:34 +01:00
Marcos García de La Fuente
8727daeb77 Unified comment addition in OpenSurveySondage::addComment and removed duplicate code 2014-01-03 16:38:02 +01:00
Marcos García de La Fuente
cf3ac246bf Moved exportcsv.php out of public folder as it should only be accesible for Dolibarr users 2014-01-03 15:35:12 +01:00
Marcos García de La Fuente
e0dd3d5bc9 Added missing copyright info 2014-01-03 15:31:29 +01:00
Marcos García de La Fuente
dd7be996c2 Improved translation of opensurvey module 2014-01-03 15:27:26 +01:00
Marcos García de La Fuente
32ca1b8881 Corrected broken links 2014-01-03 14:59:59 +01:00
Marcos García de La Fuente
7a1af8656a Removed duplicate code 2014-01-03 14:52:31 +01:00
Marcos García de La Fuente
2e995fc20b Unwanted removal of query filter in poll card 2014-01-03 14:42:39 +01:00
Marcos García de La Fuente
05ab8334ef Missing copyright info 2014-01-03 14:00:48 +01:00
Marcos García de La Fuente
93fb104077 Image alternative text was empty in creation page of surveys 2014-01-03 13:59:57 +01:00
Marcos García de La Fuente
6965d88cb5 Removed unused global vars in function llxHeaderSurvey 2014-01-03 13:59:30 +01:00
Marcos García de La Fuente
0b55181776 Little changes to improve listing of surveys 2014-01-03 13:59:13 +01:00
Alexis Algoud
68893b205c New standard VAT rate for France on january, 1st, 2014 2014-01-03 09:58:01 +01:00
Marcos García de La Fuente
694fd5810a Removed unuseful opensurvey admin page 2014-01-03 00:44:56 +01:00
Laurent Destailleur
601b2744e0 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	build/debian/changelog
 2014-01-03 00:16:29 +01:00
Laurent Destailleur
4a4084e096 Fix: doxygen 2014-01-03 00:13:16 +01:00
Laurent Destailleur
76f890b72f Fix: Call Image on this instead of pdf. 
Fix: Missing parameter for photo.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
 2014-01-02 20:51:39 +01:00
Laurent Destailleur
0b3dd9d7bb Fix: Call Image on this instead of pdf. 
Fix: Missing parameter for photo.

Conflicts:
	htdocs/core/modules/member/doc/pdf_standard.class.php
	htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
 2014-01-02 20:49:36 +01:00
Laurent Destailleur
5551a5d4b4 Fix: Call Image on this instead of pdf. 
Fix: Missing parameter for photo.
 2014-01-02 20:45:59 +01:00
Marcos García de La Fuente
44ab26698e Fixed (again) quality code control checks 2014-01-02 16:41:23 +01:00
Marcos García de La Fuente
5f3d2aea51 Opensurvey polls tab cards can now be extended from external modules 2014-01-02 16:32:48 +01:00
Marcos García de La Fuente
048ea8062a Modified GET param of poll id to accept standard ID 2014-01-02 16:32:11 +01:00
Marcos García de La Fuente
c35a704875 Printing opensurveysondage.class.php error instead of a non-translated error 2014-01-02 15:54:17 +01:00
Marcos García de La Fuente
3d1a980f2d Logging error when no poll was found in opensurveysondage.class.php 2014-01-02 15:49:49 +01:00
Laurent Destailleur
504b519fb7 Fix: Bad link for download file into documents page of supplier invoices 2014-01-01 18:37:06 +01:00
Laurent Destailleur
5fd47b34b0 Fix: Bad link for download file into documents page of supplier invoices 2014-01-01 18:30:32 +01:00
Laurent Destailleur
0bdcda50c6 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	ChangeLog
	build/exe/doliwamp/doliwamp.iss
	build/pad/pad_dolibarr.xml
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
 2013-12-31 16:13:12 +01:00
Laurent Destailleur
b1ea05e0d1 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/pad/pad_dolibarr.xml
	build/pad/pad_doliwamp.xml
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2013-12-31 15:55:10 +01:00
Laurent Destailleur
0e54780377 Fix: Update doc and packager for doliwamp 
Conflicts:
	build/exe/doliwamp/doliwamp.iss

Conflicts:
	build/exe/doliwamp/doliwamp.iss

Conflicts:
	build/exe/doliwamp/doliwamp.iss
 2013-12-31 15:41:25 +01:00
Laurent Destailleur
247c49e094 Prepare 3.5.0 release 2013-12-31 15:17:10 +01:00
Laurent Destailleur
eadccb5d9b Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/langs/bg_BG/main.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.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/commercial.lang
	htdocs/langs/et_EE/companies.lang
	htdocs/langs/et_EE/compta.lang
	htdocs/langs/et_EE/dict.lang
	htdocs/langs/et_EE/help.lang
	htdocs/langs/et_EE/main.lang
	htdocs/langs/et_EE/margins.lang
	htdocs/langs/et_EE/other.lang
	htdocs/langs/et_EE/stocks.lang
	htdocs/langs/et_EE/suppliers.lang
	htdocs/langs/et_EE/users.lang
	htdocs/langs/et_EE/withdrawals.lang
	htdocs/langs/lv_LV/admin.lang
	htdocs/langs/lv_LV/agenda.lang
	htdocs/langs/lv_LV/banks.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/lv_LV/boxes.lang
	htdocs/langs/lv_LV/opensurvey.lang
	htdocs/langs/lv_LV/users.lang
	htdocs/langs/ro_RO/admin.lang
	htdocs/langs/ro_RO/banks.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/companies.lang
	htdocs/langs/ro_RO/compta.lang
	htdocs/langs/ro_RO/cron.lang
	htdocs/langs/ro_RO/dict.lang
	htdocs/langs/ro_RO/help.lang
	htdocs/langs/ro_RO/main.lang
	htdocs/langs/ro_RO/margins.lang
	htdocs/langs/ro_RO/other.lang
	htdocs/langs/ro_RO/stocks.lang
	htdocs/langs/ro_RO/suppliers.lang
	htdocs/langs/ro_RO/withdrawals.lang
	htdocs/langs/uz_UZ/main.lang
 2013-12-31 12:18:31 +01:00
Laurent Destailleur
f44a45feb2 Fix: Missing some languages into the transifex sync script. 
Trans: Sync language files from transifex.
 2013-12-31 12:03:37 +01:00
Laurent Destailleur
0bf88ce44f Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2013-12-31 10:48:51 +01:00
Laurent Destailleur
e142bd252d Fix: disable code making jmobile crazy. 2013-12-31 10:48:15 +01:00
simnandez
9f020bb0a9 Fix: Ordering 2013-12-30 18:24:33 +01:00
Laurent Destailleur
f0151ce112 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-30 12:44:46 +01:00
Laurent Destailleur
2e0fc364bd Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-30 12:42:14 +01:00
Laurent Destailleur
f0bda47d96 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-12-30 12:39:30 +01:00
Laurent Destailleur
a59a0151fb Fix: Removed analytics tags 2013-12-30 12:35:32 +01:00
Laurent Destailleur
cfb791c584 Fix: Better translation 2013-12-29 19:30:11 +01:00
Marcos García de La Fuente
9b90e93fe5 Forgot typehinting for function payment_supplier_prepare_head 2013-12-28 23:24:24 +01:00
Marcos García de La Fuente
c6ded35d4b Fixed quality control checks for PR #1357 2013-12-28 23:13:32 +01:00
Laurent Destailleur
8248f63826 Fix: Missing translation 2013-12-27 20:31:57 +01:00
Laurent Destailleur
29ae579298 Fix: Bad link 2013-12-27 20:29:30 +01:00
Laurent Destailleur
8207b7c243 Missing translation 2013-12-27 20:27:17 +01:00
Laurent Destailleur
7d6779bd4a Merge remote-tracking branch 'origin/3.5' into develop 2013-12-27 18:09:31 +01:00
Laurent Destailleur
d07c767f25 Fix: Alignement of element into block login 2013-12-27 17:55:24 +01:00
Laurent Destailleur
538e6c5dc2 Fix: Alignement of element into block login 2013-12-27 17:51:36 +01:00
Laurent Destailleur
da2f35e1a2 Fix: Missing translation. 
Fix: Title of tab not visible
 2013-12-27 17:43:52 +01:00
BENKE Charles
94bf105b13 Update llx_projet_task.sql 
new field "ref" present on update sql but not on the table
 2013-12-27 17:14:56 +01:00
Laurent Destailleur
3bb4de3e86 Better translation 2013-12-27 15:56:00 +01:00
Laurent Destailleur
8f84d65a65 Merge pull request #1356 from defrance69/patch-22 
Update llx_projet_task.sql
 2013-12-26 16:20:23 -08:00
Laurent Destailleur
49f3242796 Merge pull request #1357 from marcosgdf/payment_menu 
Payment menu
 2013-12-26 16:19:49 -08:00
Laurent Destailleur
0e62d79ce2 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-26 19:43:31 +01:00
simnandez
3a496d1fa1 Fix: setup not saving changes 2013-12-26 11:33:47 +01:00
simnandez
91b104aeb8 Fix: setup not saving changes 2013-12-26 11:32:13 +01:00
Laurent Destailleur
22412443fe Fix: Overwrite bad value of limit payment date only if payment date is 
defined.
 2013-12-25 18:12:13 +01:00
Laurent Destailleur
76e4ba06a4 Fix: Calulcation of oustanding amount must not include abandonned 
invoices.
 2013-12-25 17:36:37 +01:00
BENKE Charles
e9ef9b6e8d Update llx_projet_task.sql 
new field "ref" present on update sql but not on the table
 2013-12-25 15:02:21 +01:00
Marcos García de La Fuente
917ddf0dee Payments and Supplier payment pages tabs can now be extended from modules. 2013-12-25 03:16:57 +01:00
Laurent Destailleur
fcfe94d4ec Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/product/liste.php
 2013-12-24 16:28:27 +01:00
Laurent Destailleur
ec1aef0191 Fix: Can import contacts not linked to any thirdparties. 2013-12-24 16:11:23 +01:00
simnandez
fca35cb8b0 Fix: Bad url destination into category remove 2013-12-24 13:40:54 +01:00
simnandez
8c9d145759 Fix: Bad url destination into category remove 2013-12-24 13:39:58 +01:00
simnandez
bf333d4f54 Fix: Some config data are shared between suppliers orders and suppliers 
invoices
 2013-12-23 16:39:37 +01:00
simnandez
d6b2f96c19 Fix: Some config data are shared between suppliers orders and suppliers 
invoices
 2013-12-23 16:38:38 +01:00
Laurent Destailleur
81f1098d41 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-12-23 12:06:07 +01:00
Laurent Destailleur
331341bf5a Fix: Bad picto 2013-12-23 12:05:32 +01:00
Laurent Destailleur
aad7d32f7d Merge pull request #1354 from csalvador/webservices-debug 
Webservices debug
 2013-12-23 02:20:15 -08:00
Florian Henry
e971e4dfff Fix [ bug #1202 ] Wrong amount in deposit % invoice from proposal 2013-12-23 11:05:14 +01:00
simnandez
d8644ec04c Fix: Unable to make a withdrawal with two or more invocies 2013-12-23 10:47:35 +01:00
simnandez
11353786a1 Fix: Unable to make a withdrawal with two or more invocies 2013-12-23 10:46:19 +01:00
Laurent Destailleur
d9c7dc8697 Fix: Add protection to not delete a root directory when deleting a 
company.
 2013-12-21 12:04:39 +01:00
Cédric Salvador
18b163c6db allow the webservice to create a private individual 2013-12-20 17:03:24 +01:00
Laurent Destailleur
47b1a2c082 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-12-20 13:55:10 +01:00
Laurent Destailleur
2bc579324d Fix: Opening agenda for a specific day 
Fix: No picto of thirdparty of contact if link is broken
 2013-12-20 13:51:59 +01:00
Laurent Destailleur
9e5e74cb58 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/fourn/commande/fiche.php
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/languages.lang
	htdocs/langs/es_ES/main.lang
 2013-12-19 21:03:15 +01:00
Laurent Destailleur
acc4850d20 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-12-19 20:57:24 +01:00
Laurent Destailleur
b35f44e3cb New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs 
when you use the "print" view on screen.
 2013-12-19 20:57:13 +01:00
simnandez
aac21c7a3c Trad: Improve es_ES trans 2013-12-19 18:33:54 +01:00
simnandez
4d3290e4bf Trad: Improve es_ES trans 2013-12-19 18:33:03 +01:00
simnandez
bfaf6d8ac8 Trad: Add missing es_ES trans 
Conflicts:
	htdocs/langs/es_ES/companies.lang
 2013-12-19 18:20:16 +01:00
simnandez
e4da8623f8 Trad: Add missing es_ES trans 2013-12-19 18:18:26 +01:00
Cédric Salvador
168412a2d6 Wrong parameters order in the function call 2013-12-19 16:06:59 +01:00
Cédric Salvador
0a0ef548ef Solved some bugs in order creation and validation 2013-12-19 16:06:59 +01:00
Cédric Salvador
f98838616e Do not forget the thumbs directory when returning the images paths 2013-12-19 16:06:59 +01:00
simnandez
03e2901070 Fix: Lost stats filters into year selection 2013-12-19 15:45:40 +01:00
simnandez
a1e0d84e37 Fix: Lost stats filters into year selection 2013-12-19 15:43:22 +01:00
simnandez
c35fc6b2d8 Trad: Fix missing translation 2013-12-19 12:48:19 +01:00
simnandez
8e247e8615 Trad: Fix missing translation 2013-12-19 12:47:39 +01:00
simnandez
42dbe88baa Trad: Add missing trans 
Conflicts:
	htdocs/langs/es_ES/main.lang
 2013-12-19 10:51:06 +01:00
simnandez
1d4cf1a255 Trad: Update es_ES translations 
Conflicts:
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/languages.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/stocks.lang
 2013-12-19 10:48:55 +01:00
simnandez
2e840a3d37 Trad: Add missing trans 2013-12-19 10:41:44 +01:00
simnandez
3b3b66e612 Trad: Update es_ES translations 2013-12-19 10:29:34 +01:00
Laurent Destailleur
7e08ee9437 Merge pull request #1351 from atm-geoffrey/3.5 
add extrafields support in supplier orders
 2013-12-18 08:56:07 -08:00
Laurent Destailleur
8036151778 Merge pull request #1352 from marcosgdf/bug-1196 
Corrected Copyright info for PR #1350
 2013-12-18 08:49:51 -08:00
Geoffrey
1942b4a476 add extrafields support in supplier orders. managed in configuration but not in view mode 2013-12-17 16:15:48 +01:00
Laurent Destailleur
11e0fb8f7a Fix: Missing ref field into export. 2013-12-17 09:11:36 +01:00
Laurent Destailleur
1dca56c213 Fix: Calculation of number of linked files was not working on taxes. 2013-12-16 23:45:12 +01:00
Marcos García
9c6df4faf4 Corrected Copyright info for PR #1350 2013-12-16 22:56:59 +01:00
Laurent Destailleur
ca36a4dd97 Merge pull request #1348 from atm-alexis/3.5 
Improper use of delete() function and ldap with multientity bug corrections
 2013-12-16 05:26:31 -08:00
Laurent Destailleur
6bfc0d14b2 Merge pull request #1350 from marcosgdf/bug-1196 
Fixed bug #1196: Product barcode search does not expect 13th digit on EAN13 type
 2013-12-16 05:26:10 -08:00
Laurent Destailleur
d01e83029e Merge remote-tracking branch 'origin/3.5' into develop 2013-12-16 14:21:17 +01:00
Laurent Destailleur
7127f5fc21 fix: doxygen 2013-12-16 14:16:01 +01:00
Laurent Destailleur
6328aec65d Merge remote-tracking branch 'origin/3.5' into develop 2013-12-16 14:12:11 +01:00
Laurent Destailleur
cfec85c2d6 Fix: Rewrite content of getMarginInfos. 
This solve bug of rounding with total price when we need a unit price.
This solve lso bug of rounding on non decimal basis that we don't want.
Also this remove calling database when not usefull so make possible to
call this function into fetch (this remove the FIXME not into comment
so).
 2013-12-16 13:24:00 +01:00
Geoffrey
dce354adc3 add extrafields support in supplier orders. managed in configuration but not in view mode 2013-12-16 11:13:39 +01:00
Alexis Algoud
ba70794c1d Add multicompany->enabled test 2013-12-16 09:45:38 +01:00
Laurent Destailleur
6946fdbcda Merge remote-tracking branch 'origin/3.5' into develop 2013-12-16 00:09:29 +01:00
Laurent Destailleur
7864fe3cfd Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
 2013-12-16 00:07:50 +01:00
Laurent Destailleur
6e9b8dc77a Fix: Missing special code 2013-12-15 21:10:39 +01:00
Marcos García
290b810bb8 Little refactor in product/liste.php 2013-12-15 18:49:55 +01:00
Marcos García
d65374bb02 Fixed bug #1196: Product barcode search does not expect 13th digit on EAN13 type 
Some code written by "hipnosapo" forum user in http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/3891-ean13-buscador-codigo-barras-13-digitos#3891
 2013-12-15 18:44:53 +01:00
Laurent Destailleur
3c87e1e20d Fix: no required class for not mandatory fields 2013-12-15 18:11:56 +01:00
Laurent Destailleur
ef2f8ea67d Removed some FIXME 2013-12-15 14:26:27 +01:00
Laurent Destailleur
c34e50114a Start to work on a basic print sticker tool 2013-12-15 03:23:10 +01:00
Laurent Destailleur
77d670ada2 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-15 02:02:51 +01:00
Laurent Destailleur
bba2892752 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/commande/liste.php
 2013-12-15 02:02:24 +01:00
Laurent Destailleur
692b2985ef Prepare 3.6 2013-12-15 00:05:04 +01:00
Laurent Destailleur
fbeb61861a Start to remove too low level permission. Philisophy of dolibarr is 
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
 2013-12-14 20:58:03 +01:00
Laurent Destailleur
dc754bbdc2 Fix: Trigger name conflicts and reference file was not matching real 
name of triggers.
 2013-12-14 20:48:34 +01:00
Laurent Destailleur
0e25939373 Fix: price function not correctly used 2013-12-14 17:40:23 +01:00
Laurent Destailleur
db9ef992eb Fix: Clean var 2013-12-14 17:25:57 +01:00
Laurent Destailleur
648bf73bac Fix: [ bug #1179 ] Wrong warnings on commande/liste.php / delivery date 
should be checked

Conflicts:
	htdocs/commande/liste.php
 2013-12-14 15:49:08 +01:00
Laurent Destailleur
ed40e6d9b0 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/langs/en_US/bills.lang
 2013-12-14 15:44:10 +01:00
Laurent Destailleur
dc1ccbfae8 Fix: [ bug #1177 ] Error on create domiciliation 2013-12-14 15:40:43 +01:00
Laurent Destailleur
4248431dc9 Fix: [ bug #1177 ] Error on create domiciliation 2013-12-14 15:35:13 +01:00
Laurent Destailleur
8cd538cce4 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-12-14 15:26:58 +01:00
Laurent Destailleur
7ecb313798 Fix: [ bug #1175 ] lien incorrect dans l'onglet Note d'un tiers 2013-12-14 15:26:22 +01:00
Laurent Destailleur
6cc20cb731 Fix: Filter on third parties were wrong for external users. 2013-12-14 15:21:15 +01:00
Laurent Destailleur
5a4b5dcc26 Fix: Missing condition 2013-12-14 14:21:27 +01:00
Laurent Destailleur
6033b7dbba Merge pull request #1347 from fappels/develop 
fix sql error on create commande
 2013-12-13 18:53:57 -08:00
Laurent Destailleur
2519f09133 Merge pull request #1345 from marcosgdf/translation-dev 
Corrected translation
 2013-12-13 18:52:48 -08:00
Laurent Destailleur
db10740e2a Merge pull request #1344 from GPCsolutions/feature/multicompanybookmarks 
Feature/multicompanybookmarks
 2013-12-13 18:52:38 -08:00
Laurent Destailleur
ad0d79a831 Merge pull request #1346 from marcosgdf/translation 
Corrected translation
 2013-12-13 18:51:04 -08:00
Laurent Destailleur
eaf151d7f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/contact/fiche.php
 2013-12-14 03:13:46 +01:00
Laurent Destailleur
7af5cc18bc Sync from transifex 2013-12-14 03:09:51 +01:00
Laurent Destailleur
c94083b56e Fix: W3C. No form into table. Make some browsers crazy. 2013-12-14 02:33:44 +01:00
Laurent Destailleur
873f4b902d Fix: W3C. No form into table. Make some browsers crazy. 2013-12-14 02:31:06 +01:00
Laurent Destailleur
42f032ded3 Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-14 01:30:15 +01:00
Laurent Destailleur
b83f664ced Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-12-14 01:29:24 +01:00
Laurent Destailleur
88aa0ad4da Fix: Doxygen problems 2013-12-14 01:28:59 +01:00
Laurent Destailleur
9af2ac1afa Sync from transifex 2013-12-14 01:05:33 +01:00
Laurent Destailleur
5cd6c05384 Fix: Uniformize amounts 2013-12-14 00:31:29 +01:00
Laurent Destailleur
8d872ab4fb Uniformize code and more comments 2013-12-14 00:24:43 +01:00
Laurent Destailleur
c51fa7048c Fix: text must not be encoded when provided as data of a function. 2013-12-13 21:12:18 +01:00
Laurent Destailleur
2f5932026e More information returned into return code 2013-12-13 18:33:05 +01:00
Laurent Destailleur
14f85dc8f1 Revert "Sync from transifex" 
This reverts commit 579e7f8e63.
 2013-12-13 17:50:28 +01:00
Laurent Destailleur
9a07f31a8c Doxygen 
Bad translation
 2013-12-13 17:36:43 +01:00
Alexis Algoud
4844aed67e Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-12-11 15:15:30 +01:00
Alexis Algoud
895f5452b4 In some cases of improper use of the delete () function, the complete repertoire of propale objects, invoice or order was deleted. 
Ex in agefodd module:
	$obj_link=new Propal($db);
        $obj_link->id=$agf->propalid;
        $resultdel=$obj_link->delete($user);

To prevent misuse of the function, the reference is not considered given
 2013-12-11 15:14:29 +01:00
Regis Houssin
0247241277 Fix: wrong path with multicompany module 2013-12-11 12:23:36 +01:00
Francis Appels
6b6a519afd fix sql error create commande 
While testing on an azure website I encountered a sql error on create
commande.
azure uses cleardb with mysql version 5.5.21-log
 2013-12-10 23:10:42 +01:00
Laurent Destailleur
18592989aa Fix: Serious pb with loading stocks. If we use product->stock_reel or 
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
 2013-12-10 22:59:56 +01:00
Laurent Destailleur
eabbff3cd3 Fix: We should not load stock details at each product fetch 2013-12-10 22:59:51 +01:00
Laurent Destailleur
be3dd26672 Mark file as bugged (seriously) 2013-12-10 22:59:45 +01:00
Laurent Destailleur
ccba895e70 Fix: sql where on an int must not contains ' 2013-12-10 22:59:40 +01:00
Laurent Destailleur
3fb3b109f8 Fix: Missing db transaction 2013-12-10 22:59:33 +01:00
Laurent Destailleur
6aba72e061 Better detection of corrupted module files. 2013-12-10 22:59:28 +01:00
Laurent Destailleur
1986a8db91 New: Add path file of trigger into admin trigger list page 2013-12-10 22:59:22 +01:00
Laurent Destailleur
68caa9e84a Sync from transifex 2013-12-10 22:59:13 +01:00
Laurent Destailleur
f4880f6a85 Fix: checkstyle 2013-12-10 22:59:01 +01:00
Marcos García de La Fuente
012dde80d3 Added missing translations for permissions of margins module 2013-12-10 22:58:55 +01:00
Laurent Destailleur
884a9ddb79 Fix: Test must never be done on a translated string 2013-12-10 22:58:50 +01:00
Laurent Destailleur
a0fab45551 Comment 2013-12-10 22:58:45 +01:00
Laurent Destailleur
25e93dc605 Update ignore file 2013-12-10 22:58:39 +01:00
Laurent Destailleur
6890c26dd9 Remove <<<< 2013-12-10 22:58:34 +01:00
Laurent Destailleur
97843cbddb Fix: Error management with corrupted module files 2013-12-10 22:58:28 +01:00
damien clochard
56162496a6 bug #1179 
if there's a delivery date (date_livraison) then use it instead of the validation date (date_valid) to check if we need to display a warning or not...

For example, if we are in Septembre and there's an order that was validated in june but its delivery date is set to november then a warning is not necessary, since there's nothing to do but wait for the order to be delivered.
 2013-12-10 22:58:23 +01:00
Laurent Destailleur
75703a03cc Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-10 21:48:22 +01:00
Laurent Destailleur
f0eb98c27a Fix: Serious pb with loading stocks. If we use product->stock_reel or 
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
 2013-12-10 19:42:49 +01:00
Laurent Destailleur
a6b188ed93 Fix: We should not load stock details at each product fetch 2013-12-10 19:41:45 +01:00
Laurent Destailleur
da569ea8d4 Fix: Serious pb with loading stocks. If we use product->stock_reel or 
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
 2013-12-10 19:39:28 +01:00
Laurent Destailleur
ad420bbf42 Mark file as bugged (seriously) 2013-12-10 18:56:02 +01:00
Laurent Destailleur
aa4ae60826 Fix: sql where on an int must not contains ' 2013-12-10 18:54:44 +01:00
Laurent Destailleur
ce3047203f Fix: Missing db transaction 2013-12-10 18:54:07 +01:00
Laurent Destailleur
286bdf91d4 Better detection of corrupted module files. 2013-12-10 18:52:48 +01:00
Laurent Destailleur
df779086a6 Fix: We should not load stock details at each product fetch 2013-12-10 18:04:25 +01:00
Laurent Destailleur
b1e6ac5631 Mark file as bugged (seriously) 2013-12-10 17:53:12 +01:00
Laurent Destailleur
c78fc504af Fix: sql where on an int must not contains ' 2013-12-10 17:21:48 +01:00
Laurent Destailleur
7b73201f2e Fix: Missing db transaction 2013-12-10 17:18:28 +01:00
Laurent Destailleur
c3c6588426 Better detection of corrupted module files. 2013-12-10 16:25:27 +01:00
Laurent Destailleur
65593bce34 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-12-10 15:51:16 +01:00
Laurent Destailleur
8fb0986303 New: Add path file of trigger into admin trigger list page 2013-12-10 15:49:57 +01:00
Marcos García de La Fuente
02700edf22 Corrected translation 2013-12-10 14:38:34 +01:00
Marcos García de La Fuente
d226abcdfc Corrected translation 2013-12-10 14:30:40 +01:00
Raphaël Doursenaud
0d36435018 Added missing language loads for bookmarks 2013-12-10 12:04:07 +01:00
Raphaël Doursenaud
add5a232ac Added some security assessments to bookmarks 2013-12-10 12:01:08 +01:00
Raphaël Doursenaud
5e642f3009 Bookmarks multicompany migration 2013-12-10 12:00:42 +01:00
Raphaël Doursenaud
071dd8e758 Make bookmarks module multicompany aware 2013-12-10 12:00:42 +01:00
Raphaël Doursenaud
d3d1863150 Removed unused file 2013-12-10 11:39:41 +01:00
Raphaël Doursenaud
5ba9a1134b Removed dead code 2013-12-10 11:38:02 +01:00
Laurent Destailleur
a89a4ee81a Fix: Delete vat entry when bank line was already deleted. 2013-12-09 22:39:41 +01:00
Laurent Destailleur
c49af3da48 Fix: fields too large 2013-12-09 11:00:36 +01:00
Laurent Destailleur
579e7f8e63 Sync from transifex 2013-12-09 09:26:48 +01:00
Laurent Destailleur
d34d1aed2e Fix: checkstyle 2013-12-09 02:21:21 +01:00
Laurent Destailleur
72250f656e Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-09 02:17:43 +01:00
Laurent Destailleur
95a41ca2fd Merge pull request #1343 from marcosgdf/missing-translations 
Added missing translations for permissions of margins module
 2013-12-08 17:01:38 -08:00
Laurent Destailleur
705192215a Merge pull request #1341 from marcosgdf/bug-1182 
Resolved bug #1182: ODT company_country tag is htmlencoded
 2013-12-08 16:49:50 -08:00
Laurent Destailleur
f36354234d Merge pull request #1339 from daamien/patch-1 
bug #1179
 2013-12-08 16:48:52 -08:00
Laurent Destailleur
565fb615bc Update gitignore 2013-12-09 01:41:48 +01:00
Laurent Destailleur
bf07bd5b24 Fix: Missing translation 2013-12-08 23:58:27 +01:00
Laurent Destailleur
f804833b9c Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/modules/modFacture.class.php
 2013-12-08 22:38:10 +01:00
Laurent Destailleur
825640d645 Fix: Missing special code into export 2013-12-08 21:24:59 +01:00
Marcos García de La Fuente
02036af782 Added missing translations for permissions of margins module 2013-12-08 21:18:01 +02:00
Marcos García de La Fuente
beb93e9245 Resolved bug #1182: ODT company_country tag is htmlencoded 2013-12-08 20:23:44 +02:00
Laurent Destailleur
a05d9b864a Fix: Test must never be done on a translated string 2013-12-08 16:40:45 +01:00
Laurent Destailleur
b0e18348d9 Fix: Test must never be done on a translated string 2013-12-08 16:39:47 +01:00
Laurent Destailleur
3c0c9019b5 Comment 2013-12-08 15:40:22 +01:00
Laurent Destailleur
9b779e8ed8 Update ignore file 2013-12-08 15:09:35 +01:00
Laurent Destailleur
4d44f93c98 Remove <<<< 2013-12-08 12:01:59 +01:00
Laurent Destailleur
7aa2c9dcd1 Fix: Error management with corrupted module files 2013-12-08 02:33:32 +01:00
Laurent Destailleur
a90f6ef368 Fix: Error management with corrupted module files 2013-12-08 02:32:04 +01:00
Laurent Destailleur
37b0780523 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/ecm/tpl/builddatabase.tpl.php
	htdocs/fourn/commande/liste.php
	htdocs/product/admin/product_tools.php
 2013-12-08 00:42:36 +01:00
Laurent Destailleur
d8cd7571ec Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-12-07 18:48:31 +01:00
Laurent Destailleur
b637b28c8b Update ignore files 2013-12-07 18:47:58 +01:00
Laurent Destailleur
0e819ab5cd Fix: Missing test 2013-12-07 16:43:35 +01:00
Laurent Destailleur
73e60e0629 Fix: Mass update of vat must work also for supplier prices 
Conflicts:
	htdocs/product/admin/product_tools.php
 2013-12-07 12:06:41 +01:00
Laurent Destailleur
adf55408a4 Fix: Bad parameter that duplicate info. 2013-12-07 03:23:14 +01:00
Laurent Destailleur
fa0470bdb9 Fix: Mass update of vat must work also for supplier prices 2013-12-07 02:29:24 +01:00
Laurent Destailleur
01a9b23f26 Fix: Vat rate was not set during update 2013-12-07 01:22:27 +01:00
Laurent Destailleur
62e209520a Fix: Update when submitting form 2013-12-07 00:53:58 +01:00
Laurent Destailleur
76d111b09f Fix: W3C form must be outside table tag 2013-12-07 00:26:30 +01:00
Laurent Destailleur
87db1d880b Fix: css 2013-12-06 21:03:59 +01:00
damien clochard
c36ba2a8ea bug #1179 
if there's a delivery date (date_livraison) then use it instead of the validation date (date_valid) to check if we need to display a warning or not...

For example, if we are in Septembre and there's an order that was validated in june but its delivery date is set to november then a warning is not necessary, since there's nothing to do but wait for the order to be delivered.
 2013-12-06 13:08:30 +01:00
Laurent Destailleur
598a241366 Fix: minor css. 
Fix: Alignement of screenshot was wrong. Wrapping too.
 2013-12-06 10:23:26 +01:00
Laurent Destailleur
f60f5b2751 Fix: css 2013-12-06 10:04:53 +01:00
Laurent Destailleur
b99eddc73e Fix: unit 2013-12-05 21:32:48 +01:00
Laurent Destailleur
42a3cbd27c Fix: Missing css class 2013-12-04 23:21:57 +01:00
Laurent Destailleur
4d9712ea4c Merge pull request #1318 from csalvador/develop-fichinterPDF 
Develop fichinter pdf
 2013-12-04 09:41:13 -08:00
Laurent Destailleur
24ce511671 Fix: [ bug #1167 ] Supplier IBAN account number set but no account 
specified warning
 2013-12-04 18:20:58 +01:00
Laurent Destailleur
f2ba1a538b Fix: Useless css styles make jmobile wrong 2013-12-03 20:54:27 +01:00
Laurent Destailleur
533199c151 Fix: Missing translation and missing comments 2013-12-03 20:54:22 +01:00
Laurent Destailleur
202c6b728e Fix: Useless css styles make jmobile wrong 2013-12-03 20:53:39 +01:00
Laurent Destailleur
01c91c7194 Fix: Missing translation and missing comments 2013-12-03 20:44:31 +01:00
Florian Henry
c2a8967b52 Much better fix for translated product description into PDF 2013-12-03 17:06:19 +01:00
Laurent Destailleur
6c7e173bba Fix: jmobile broken with css tagtable, tagtr and tagtd 2013-12-02 22:31:02 +01:00
Laurent Destailleur
a3372a9a0a Fix: Regression 2013-12-02 22:14:47 +01:00
Laurent Destailleur
d7bb138f43 Fix: Missing status 4 and 5 2013-12-02 22:12:57 +01:00
Laurent Destailleur
0ff9533786 Missing css 2013-12-02 20:30:15 +01:00
Laurent Destailleur
2c92818488 Missing translations 2013-12-02 20:12:48 +01:00
Alexis Algoud
c49aabe574 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-12-02 16:06:58 +01:00
Alexis Algoud
bb191021de Add entitytotest test, because a LDAP user can override the entity restriction without this test 2013-12-02 16:04:30 +01:00
Florian Henry
bc4cfd66db Fix: fix unsubscribe URL into mailing when sending manually (not by 
script)
 2013-12-02 15:07:34 +01:00
Laurent Destailleur
b6a910cf34 Fix: jmobile is crazy, we can disable it 2013-12-02 12:34:46 +01:00
Alexis Algoud
38c7c609bc Error on mercure bill's number function. 
Ex draft bill for november :
mask = FC{yy}{mm}{000@99}
{mm} = 11
On validation, number -> FC131160 instead of FC131112
 2013-12-02 11:42:39 +01:00
Florian Henry
3e712c9c8c Finnaly make it works 2013-12-02 11:11:08 +01:00
Florian Henry
0907d81fcb Avoid strpos bug if string is empty or null 2013-12-02 11:05:07 +01:00
Florian Henry
1ad1b25f6e remove useless space 2013-12-02 10:29:58 +01:00
Florian Henry
1b38d36f28 Better Fix 2013-12-02 10:27:41 +01:00
Laurent Destailleur
38e695b960 Look: Better support for jmobile 2013-12-02 07:38:37 +01:00
Laurent Destailleur
b12fb56be4 Fix regression 2013-12-02 05:59:11 +01:00
Laurent Destailleur
f45a31969b Fix regression 2013-12-02 05:52:41 +01:00
Laurent Destailleur
1e50543496 Merge pull request #1331 from GPCsolutions/35b-review 
Fixes for 3.5 beta
 2013-12-01 20:34:51 -08:00
Florian Henry
c0ef63fd74 Bteer fix 2013-12-02 00:22:49 +01:00
Florian Henry
ff9c84fd0e Better test for HTMLentities desc translation 2013-12-02 00:20:50 +01:00
Laurent Destailleur
6c26684284 Fix: [ bug #1166 ] Supplier account number in its card does not respect 
order set in Banks module.
 2013-12-01 23:17:16 +01:00
Laurent Destailleur
c475346248 Fix: [ bug #1166 ] Supplier account number in its card does not respect 
order set in Banks module.
 2013-12-01 23:16:18 +01:00
Florian Henry
11efc20755 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 
Conflicts:
	ChangeLog

Change-Id: I90f7ee62c65ef449c8ca43857d9743d0d953cf4b
 2013-12-01 22:50:18 +01:00
Florian Henry
c6991f97d4 [ bug #1174 ] Product translated description not good into PDF 
Country
 2013-12-01 22:47:22 +01:00
Laurent Destailleur
c54c06e8d3 Fix: [ bug #1171 ] Documents lost in interventions after validating 2013-12-01 21:04:52 +01:00
Laurent Destailleur
45b1273992 Fix: [ bug #1171 ] Documents lost in interventions after validating 2013-12-01 21:03:49 +01:00
Laurent Destailleur
f7d855f4ce Fix: [ bug #1171 ] Documents lost in interventions after validating 2013-12-01 21:03:12 +01:00
Laurent Destailleur
2f88406677 Fix: [ bug #1075 ] POS module doesn't decrement stock of products in 
Delayed payment mode.
 2013-12-01 20:15:08 +01:00
Laurent Destailleur
dbd1c57f0a Fix: [ bug #1075 ] POS module doesn't decrement stock of products in 
Delayed payment mode.
 2013-12-01 20:13:52 +01:00
Laurent Destailleur
820cdde97b Fix: Currency is not visible 2013-12-01 20:13:45 +01:00
Laurent Destailleur
ad9e7b8593 Fix: [ bug #1075 ] POS module doesn't decrement stock of products in 
Delayed payment mode.
 2013-12-01 20:12:47 +01:00
Laurent Destailleur
9f251a7838 Fix: Currency is not visible 2013-12-01 19:59:01 +01:00
Laurent Destailleur
0b9e8d6832 Fix: Alignement 2013-12-01 19:41:41 +01:00
Laurent Destailleur
30428ec6e5 Fix: Control on minimum amount must be one only on standard and 
replacement invoices.

Conflicts:
	htdocs/compta/facture.php
 2013-12-01 19:41:29 +01:00
Laurent Destailleur
a6e4ba7001 Fix: No limits for drafts lists 2013-12-01 19:40:36 +01:00
Laurent Destailleur
e9e94b9e47 Fix: Alignement 2013-12-01 19:39:21 +01:00
Laurent Destailleur
27c6b30651 Fix: Control on minimum amount must be one only on standard and 
replacement invoices.
 2013-12-01 18:56:20 +01:00
Laurent Destailleur
6e96d60c6c Fix: No limits for drafts lists 2013-12-01 18:53:16 +01:00
Laurent Destailleur
bfd229d484 Fix: [ bug #1079 ] External users can't access projects even if it is a 
contact.
 2013-12-01 18:14:19 +01:00
Laurent Destailleur
f207aabe7a Fix: When editing thirdparty, result is not refreshed 2013-12-01 18:13:57 +01:00
Laurent Destailleur
eaa6d987b6 Fix: When database is not synchronized with dir, we clean database. 2013-12-01 17:32:05 +01:00
Laurent Destailleur
84e3457023 Fix: [ bug #1161 ] Search on product label 2013-12-01 16:30:35 +01:00
Laurent Destailleur
8f1a553395 Fix: [ bug #1162 ] Traduction des mi-journées 2013-12-01 16:22:06 +01:00
Laurent Destailleur
395066519b Fix: [ bug #1163 ] SQL Error when searching for supplier orders 2013-12-01 16:18:18 +01:00
Laurent Destailleur
b6386a3dce Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/tpl/objectline_add.tpl.php
 2013-12-01 16:08:03 +01:00
Laurent Destailleur
d39ed05c5d Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/comm/propal/list.php
 2013-12-01 16:05:09 +01:00
Laurent Destailleur
cbf1ddaa17 Fix: [ bug #1079 ] External users can't access projects even if it is a 
contact.
 2013-12-01 16:01:33 +01:00
Laurent Destailleur
833fb1a126 Fix: When editing thirdparty, result is not refreshed 2013-12-01 15:46:15 +01:00
Laurent Destailleur
25f49b6a24 Fix: bad test 2013-12-01 15:29:07 +01:00
Laurent Destailleur
519919889c Fix comment 2013-11-30 16:57:11 +01:00
Laurent Destailleur
abec634960 Look: Better support for jmobile 2013-11-30 02:31:17 +01:00
Raphaël Doursenaud
e24555822e Fixed install generated $dolibarr_main_url_root_alt path 
We now use relative paths.
So let's remove the absolute part from the install generated configuration file.
 2013-11-29 17:28:17 +01:00
Raphaël Doursenaud
771d576e2b Better error wording 2013-11-29 17:23:42 +01:00
Cédric Salvador
22d31817de made getVATRates synchronous to avoid concurrency problems 2013-11-29 12:13:23 +01:00
Laurent Destailleur
e27d109f2d Merge pull request #1328 from csalvador/develop-fixAJAX 
Develop fix ajax
 2013-11-29 02:59:11 -08:00
Grand Philippe
438d7b0fb2 fix regression 2013-11-29 11:04:22 +01:00
Grand Philippe
c0650d6da3 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-11-29 08:30:46 +01:00
Laurent Destailleur
ea51e9ec77 Merge remote-tracking branch 'origin/3.5' into develop 2013-11-28 18:57:43 +01:00
Laurent Destailleur
d0b05bb5af Fix: Restore style code lost by a commit. 2013-11-28 18:55:36 +01:00
Laurent Destailleur
5715e9c986 Merge remote-tracking branch 'origin/3.5' into develop 2013-11-28 17:06:11 +01:00
Laurent Destailleur
d1e62bebf0 Fix: Removed a merged that we ddidn't want. 2013-11-28 17:01:37 +01:00
Grand Philippe
5b2f9af7dc fix management of all errors messages 2013-11-28 16:44:57 +01:00
Grand Philippe
1ac5bd3f28 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-11-28 16:39:29 +01:00
Laurent Destailleur
bdf8100d84 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/product/stats/commande_fournisseur.php
 2013-11-28 15:54:12 +01:00
Cédric Salvador
ec3fc4e6e6 indentation 2013-11-28 15:53:28 +01:00
Cédric Salvador
2da88a2966 made getVATRates synchronous to avoid concurrency problems 2013-11-28 15:52:26 +01:00
philippe
d5606b6045 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2013-11-28 15:09:16 +01:00
Laurent Destailleur
a3e55822a4 Missing translation 2013-11-28 14:36:13 +01:00
Florian Henry
b9d37fd6f7 [ bug #1159 ] Commercial search "other" give p.note do not exists 2013-11-28 14:28:03 +01:00
Grand Philippe
1fc50c137b Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-11-28 14:25:42 +01:00
Grand Philippe
c88bb553bd fix wrong example path 2013-11-28 14:25:11 +01:00
Laurent Destailleur
88ae0a7945 Fix: the rename function is bugged with some windows. I add a 
workaround.
Fix: Add also a workaround for [ bug 1064 ] Date/Time in ICS incorrect.
 2013-11-28 12:58:02 +01:00
Florian Henry
5f8e896e0c Fix [ bug #1154 ] Error when closing a service in a contract (pgsql) 2013-11-27 22:58:49 +01:00
Florian Henry
afc729c694 [ bug #1153 ] SQL Error on the VAT main screen (with pgsql) 2013-11-27 22:49:54 +01:00
Florian Henry
2178ab6007 Fix [ bug #1156 ] Update TVA mass update tools do not work 2013-11-27 22:05:29 +01:00
Raphaël Doursenaud
f71b39b1c3 Added missing class member 2013-11-27 15:20:37 +01:00
Laurent Destailleur
c3af8b6b29 Sync from transifex 2013-11-27 14:59:02 +01:00
Laurent Destailleur
b71406f12d Merge pull request #1322 from aspangaro/develop 
Improvement of the Skype button
 2013-11-26 07:29:37 -08:00
Laurent Destailleur
6729f03ee6 Merge pull request #1323 from grandoc/3.5 
fix language and standardize code
 2013-11-26 07:28:30 -08:00
Laurent Destailleur
0383dc4706 Fix: 2 bugs during validation of a member 2013-11-26 13:10:00 +01:00
Laurent Destailleur
854cfc741e Fix: 2 bugs during validation of a member 2013-11-26 13:04:15 +01:00
Laurent Destailleur
18ed9d5ca7 Fix: Filter on accountancy report were lost when using "print" view. 2013-11-25 16:51:30 +01:00
Grand Philippe
e8e5f4d943 missing trad 2013-11-25 13:55:01 +01:00
Grand Philippe
203a98d4ae fix language and standardize code 2013-11-25 10:30:02 +01:00
aspangaro
e1b4d01235 Improvement of the Skype button 
Perm & add a button"Chat"
 2013-11-24 21:28:15 +01:00
Florian Henry
f1d0879419 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-24 18:07:47 +01:00
Florian Henry
8f9143cef7 revert param_ihm 2013-11-24 18:07:40 +01:00
Grand Philippe
fae27842b7 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5 2013-11-24 14:50:07 +01:00
Grand Philippe
08e44135bf add missing trad 2013-11-24 14:47:44 +01:00
Laurent Destailleur
65b6dca554 Fix: business rule to protect button and action was not synchronized 2013-11-24 13:46:40 +01:00
Laurent Destailleur
4cf2c3d58c Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2013-11-24 13:41:54 +01:00
Laurent Destailleur
8cd0647d7e Fix: business rule to protect button and action was not synchronized 2013-11-24 13:40:33 +01:00
Laurent Destailleur
73408479ba Merge remote-tracking branch 'origin/3.5' into develop 2013-11-24 13:19:41 +01:00
Grand Philippe
1f7e6a42c2 add a Social contributions type and fix some language stuff 2013-11-24 11:33:36 +01:00
Laurent Destailleur
e45406694b Fix: no filter is value is '' 2013-11-23 19:28:41 +01:00
Laurent Destailleur
aa3c16b6af Fix: chars were lost by function 2013-11-23 16:34:08 +01:00
Laurent Destailleur
8e313ef32d Fix: Can add ban record but was not possible to delete 2013-11-23 16:17:20 +01:00
Laurent Destailleur
628e8bea83 Fix: Missing error message when files were too large. 2013-11-23 15:22:27 +01:00
Florian Henry
6615ee7e6f [ bug #1148 ] Product consomation : supplier order bad status 2013-11-23 14:59:28 +01:00
Laurent Destailleur
6ffdc039a2 Fix: When option is not set, it must not appears as set. 2013-11-23 14:51:49 +01:00
Laurent Destailleur
64031f92fa Fix: Problem with W3C and wrapping of some title lines. 2013-11-23 14:50:13 +01:00
Laurent Destailleur
8496b1787c Color too agressive 2013-11-23 14:46:46 +01:00
Laurent Destailleur
4b16551f88 Merge pull request #1316 from defrance69/patch-20 
Update modAgenda.class.php
 2013-11-23 05:05:55 -08:00
Laurent Destailleur
a171c40531 Merge pull request #1317 from GPCsolutions/develop-fixaddline 
Made update price synchronous to avoid dependency hell
 2013-11-23 05:03:01 -08:00
Laurent Destailleur
9156e9168f Add upgrade script 2013-11-23 13:19:55 +01:00
Laurent Destailleur
b8141ef2db Prepare 3.6 dev 2013-11-22 19:32:36 +01:00
Laurent Destailleur
20e6ca74c7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-22 18:25:08 +01:00
Florian Henry
cca303cee6 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-22 15:07:16 +01:00
simnandez
58a8f590e6 New: Add graph stats for suppliers orders in tab "stats" on products. 2013-11-22 14:47:16 +01:00
Florian Henry
f852c9a5bb Fix [ bug #1145 ] Agenda button list type do not display 2013-11-22 14:43:15 +01:00
simnandez
5d34953200 New: Add list of orders products in tab "consumption" on thirdparties. 2013-11-22 14:30:29 +01:00
Laurent Destailleur
224abc3831 Fix: When option is not set, it must not appears as set. 2013-11-22 13:18:01 +01:00
Laurent Destailleur
04fdfb4047 Fix: Problem with W3C and wrapping of some title lines. 2013-11-22 11:45:42 +01:00
Cédric Salvador
2b6a5508c7 debug the Soleil model 2013-11-22 09:51:48 +01:00
Cédric Salvador
c73057ead9 show page number 2013-11-22 09:51:48 +01:00
Cédric Salvador
eb04d8b076 show signature space on the last page only 2013-11-22 09:51:47 +01:00
Laurent Destailleur
10e5c1c22e Merge remote-tracking branch 'origin/3.5' into develop 2013-11-21 18:51:18 +01:00
Laurent Destailleur
4a1f6713ff Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
 2013-11-21 18:45:33 +01:00
Laurent Destailleur
6f5e78d27e Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-21 18:42:14 +01:00
Laurent Destailleur
29e029161f Fix: Restore translation lost because entry was not set into en_US lang. 2013-11-21 18:41:06 +01:00
Raphaël Doursenaud
302a230bf2 Made update price synchronous to avoid dependency hell 2013-11-21 18:00:27 +01:00
BENKE Charles
1bb7ddc2b1 Update modAgenda.class.php 
export extensions
 2013-11-21 17:32:11 +01:00
Laurent Destailleur
00b0031ddf Fix: If no permission to edit object, form to change category must be 
hidden
Fix: Adding supplier category was saved into wrong table.
 2013-11-21 16:34:38 +01:00
Laurent Destailleur
a7d0357d5d Fix: If no permission to edit object, form to change category must be 
hidden
Fix: Adding supplier category was saved into wrong table.
 2013-11-21 16:26:56 +01:00
Florian Henry
ea0bbb5896 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-11-21 12:29:03 +01:00
Florian Henry
7f950d8b45 Fix user pram_ihm, display tab and allow modify button only is user 
right allow it is OK
 2013-11-21 12:28:51 +01:00
Laurent Destailleur
0d853cf73d Fix: [ bug #1118 ] Minor problem on print page link 2013-11-21 02:49:22 +01:00
Laurent Destailleur
f6f4f425af Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
 2013-11-21 02:31:04 +01:00
Laurent Destailleur
9e9a386852 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/compta/facture.php
 2013-11-21 02:19:21 +01:00
Laurent Destailleur
e63dcc5343 Fix: [ bug #1119 ] If no country is selected for a warehouse or thids 
card,
broken IMG is shown
 2013-11-21 02:14:25 +01:00
Laurent Destailleur
23f7de0873 Fix: [ bug #1094 ] Invoice Text Reminder 
Conflicts:
	htdocs/compta/facture.php
 2013-11-21 02:07:13 +01:00
Laurent Destailleur
7871ccb9aa Fix: [ bug #1094 ] Invoice Text Reminder 2013-11-21 02:02:31 +01:00
Laurent Destailleur
358175b357 Merge remote-tracking branch 'origin/3.4' into develop 2013-11-20 23:48:06 +01:00
Laurent Destailleur
35596acf40 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/product/fiche.php
 2013-11-20 23:46:33 +01:00
Laurent Destailleur
cb539399a0 Merge pull request #1302 from FHenry/develop 
Fix output of extrafield select list from table
 2013-11-20 14:42:50 -08:00
Laurent Destailleur
a9d5363799 Merge pull request #1313 from altairis-fr/3.3 
[Task 1144 ] Fix wrong max-length of produt ref
 2013-11-20 14:33:57 -08:00
Laurent Destailleur
71484a4e1e Fix: Missing hook declaration 2013-11-20 14:29:50 +01:00
Florian Henry
f88e9425ec Remove useless code (the tag replacement into footer and header is 
already done by SetVar method)
 2013-11-20 14:01:43 +01:00
Florian Henry
306a51f6bd remove useless code (the tag replacement into footer and header is 
already done by SetVar method)
 2013-11-20 13:54:53 +01:00
Laurent Destailleur
413e0908fe Doxygen 2013-11-20 12:55:13 +01:00
Laurent Destailleur
63e1ecccd3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-20 12:46:05 +01:00
Laurent Destailleur
b04a12c39a Missing vat rate for canada 2013-11-20 12:45:38 +01:00
Christophe Battarel
e654dac578 [Task 1144 ] Fix wrong max-length of produt ref 2013-11-20 10:33:06 +01:00
Regis Houssin
4c29bddfda Fix: wrong variable name 
Fix: restore address.class.php, this class is used
 2013-11-20 09:40:56 +01:00
Regis Houssin
f305524e29 Revert "Qual: Removed not used file" 
This reverts commit 603c2aa938.
 2013-11-20 09:34:54 +01:00
Florian Henry
ed21b573ea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-20 00:46:50 +01:00
Florian Henry
0fe870395f Use mtethos Post instead of get 2013-11-20 00:46:04 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
 2013-11-19 21:08:02 +01:00
Laurent Destailleur
568c296c6c Merge pull request #1310 from GPCsolutions/develop-nocrlf 
Use LF instead of CRLF
 2013-11-19 11:44:51 -08:00
Laurent Destailleur
25bbe824f1 Merge pull request #1309 from csalvador/develop-formcontract-include 
included the FormContract class to avoid fatal error
 2013-11-19 11:43:53 -08:00
Raphaël Doursenaud
7945011955 Make AJAX new line form work again 
FIXME: Factorize!
 2013-11-19 17:54:36 +01:00
Raphaël Doursenaud
83f99b5ba6 Use LF instead of CRLF 2013-11-19 14:36:55 +01:00
Cédric Salvador
c885389ac6 included the FormContract class to avoid fatal error 2013-11-19 14:23:17 +01:00
Florian Henry
870b78fc19 [ bug #1142 ] Set paiement on invoice 2013-11-19 10:41:00 +01:00
Laurent Destailleur
6596a105e7 Merge pull request #1307 from hameau/patch-2 
Update printipp.lang
 2013-11-18 11:43:50 -08:00
hameau
9d2dee207a Update bills.lang 
Minor typos
 2013-11-18 18:13:34 +01:00
hameau
a94fb12e5e Update other.lang 
Minor typo
 2013-11-18 18:07:17 +01:00
hameau
c04d454d4f Update withdrawals.lang 
Minor typos.
 2013-11-18 18:05:36 +01:00
hameau
0501491475 Update printipp.lang 
Minor typos; minor translation fr->en.
 2013-11-18 17:45:19 +01:00
hameau
b28d15574e Update main.lang 
Minor typos; capitalise month names; minor fr->en.
 2013-11-18 17:34:08 +01:00
Laurent Destailleur
a71e4c598a Fix: Must navigate between all thirdparties elligible for tab. 2013-11-18 15:41:42 +01:00
Laurent Destailleur
2d260fa6dd Fix: Missing alignement 2013-11-18 14:25:53 +01:00
Laurent Destailleur
69f0d596ba Fix: Pagination 2013-11-18 12:20:53 +01:00
Laurent Destailleur
e8101e3cde Fix: Missing field 2013-11-18 12:00:42 +01:00
Laurent Destailleur
2b63fd67b5 Minor fix in cron feature 2013-11-18 11:42:28 +01:00
Laurent Destailleur
5703dfe55a Trans 2013-11-18 11:31:34 +01:00
Laurent Destailleur
d209d931e4 Doxygen 2013-11-18 00:29:11 +01:00
Laurent Destailleur
4356496ee8 Qual: File is not a class of a module 2013-11-18 00:20:05 +01:00
Laurent Destailleur
afa5bdb837 Fix: phpunit error 2013-11-18 00:12:13 +01:00
Laurent Destailleur
6a5b3e2020 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-17 23:26:37 +01:00
Laurent Destailleur
48570f599a Fix: form is not allowed into a table. This break some javascript and 
make some browsers crazy.
 2013-11-17 23:25:25 +01:00
Florian Henry
cc43fac0aa Add status filter into product list 2013-11-17 17:25:14 +01:00
Florian Henry
00064ed500 Add status filter into user list 2013-11-17 17:09:58 +01:00
Florian Henry
a2368daa57 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-17 17:07:00 +01:00
Christophe Battarel
89a5638908 Fix bad translation on margin config 2013-11-17 12:59:33 +01:00
Laurent Destailleur
930328f235 Prepare 3.5 beta 2013-11-17 03:33:58 +01:00
Laurent Destailleur
0f4ceca8ec Fix: tons of bugs into ecm module 2013-11-17 02:59:01 +01:00
Laurent Destailleur
45aac81b71 Doc: More comments 2013-11-16 18:12:13 +01:00
Laurent Destailleur
3c0ee64648 New: Add links to social networks 2013-11-16 15:40:46 +01:00
Laurent Destailleur
946c91dc72 Fix: Removed deprecated support links 2013-11-16 15:08:57 +01:00
Laurent Destailleur
d28eacebd7 Fix: Remove an edit button that is not implemented. 2013-11-16 14:53:08 +01:00
Laurent Destailleur
8ec50fce23 Move warning at correct place. 
Fix: Reset of amount was not working
 2013-11-16 14:26:42 +01:00
Laurent Destailleur
b7190d2609 Fix: Several bugs. 2013-11-16 13:00:21 +01:00
Laurent Destailleur
5b243abe4b Fix: Miscellaneous fixes 2013-11-16 12:00:08 +01:00
Laurent Destailleur
d0d9cce146 Fix: price should not be used to compare amounts. Price is a formated 
string, not an amount.
 2013-11-15 22:15:48 +01:00
simnandez
c8f1a26d25 Format with price function 2013-11-15 17:55:48 +01:00
simnandez
618bf4d75e Remove td 2013-11-15 17:48:19 +01:00
simnandez
0aba9b02b8 Add alert for outstanding bill 2013-11-15 17:43:13 +01:00
Florian Henry
7696730680 Fix output of extrafield select list from table (in case of filter with 
extrafields table)
 2013-11-15 15:44:04 +01:00
Florian Henry
85ea8b4161 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-15 15:41:37 +01:00
Laurent Destailleur
1e008ede3c Merge pull request #1298 from Pfontaine/features/multi_rib 
Features/multi rib
 2013-11-15 06:27:58 -08:00
Laurent Destailleur
52b66a839b Merge pull request #1296 from FHenry/3.4 
Better nl_NL translation
 2013-11-15 05:06:44 -08:00
Laurent Destailleur
c324f6a9a3 Merge pull request #1295 from FHenry/develop 
Display customer code (according setting) into list
 2013-11-15 05:05:36 -08:00
Laurent Destailleur
ef9db84a88 Merge pull request #1297 from GPCsolutions/3.4-dbupgradefix 
Sync db upgrade with db install to avoid silly upgrade errors
 2013-11-15 05:05:01 -08:00
Laurent Destailleur
a92aa14459 Merge pull request #1299 from altairis-fr/3.4 
fix wrong buy price update (confusion between entity and npr !)
 2013-11-15 05:04:07 -08:00
Laurent Destailleur
a2380805c8 Merge pull request #1300 from Pfontaine/fix/contact_soc 
fix contact creation
 2013-11-15 05:01:01 -08:00
Laurent Destailleur
b3a1d695cd Qual: Better message for total of buying price 
Fix: Little debug of add link feature. Link was broken because of
missing http, fix W3C making output wrong with some browsers.
 2013-11-15 11:43:16 +01:00
aspangaro
8050f8e9fe Fix problem field 2013-11-14 21:40:30 +01:00
aspangaro
e8c7bb9c62 Fix for language 2013-11-14 21:02:33 +01:00
Laurent Destailleur
a0358dc0c2 Better management of price of subproducts feature 2013-11-14 20:54:40 +01:00
Florian Henry
673c701ebc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-14 19:41:43 +01:00
Florian Henry
05e0af0f23 WebService contact with statut (the new field) 2013-11-14 19:41:27 +01:00
Laurent Destailleur
8b60c79033 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-14 17:17:19 +01:00
Peter Fontaine
5a1df20c80 fix contact creation 2013-11-14 17:16:27 +01:00
Laurent Destailleur
b911d30684 Fix: Stock into subproduct was wrong 
New: Show best sell price and total for virtual products
 2013-11-14 17:16:17 +01:00
simnandez
b9c8852471 Qual: Improve suppliers orders manual receivings 2013-11-14 17:08:59 +01:00
Laurent Destailleur
2e5320a532 Qual: Clean and uniformize code 2013-11-13 23:35:33 +01:00
Laurent Destailleur
cf3d6d410c Fix: Use correct css 2013-11-13 21:50:16 +01:00
Florian Henry
fe0006c71d Merge from dev 2013-11-13 21:34:02 +01:00
Florian Henry
a8e31ad956 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/company.lib.php

Change-Id: Iec6a98430bfd500defda256862a1ed7869ef407a
 2013-11-13 21:33:12 +01:00
Laurent Destailleur
588a30fa80 Fix: Bad status 2013-11-13 21:14:11 +01:00
Laurent Destailleur
e63542d8a6 Fix: avoid scroll 2013-11-13 20:37:05 +01:00
Laurent Destailleur
5a8f4905d6 Fix: bad link into ecm module 2013-11-13 20:36:07 +01:00
Laurent Destailleur
7a714906a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-13 18:46:25 +01:00
Laurent Destailleur
d57aa65d30 Fix: Add option to fix warning not visible when there is preactivated 
modules
 2013-11-13 18:45:36 +01:00
Christophe Battarel
7dbe2bcf2c fix wrong buy price update 2013-11-13 18:41:31 +01:00
Florian Henry
652d7db0b4 Get Status from getLibStatus ! 2013-11-13 17:26:29 +01:00
Florian Henry
6d8871b4cf Add filter on show_contact company.lib.php 2013-11-13 17:02:30 +01:00
Florian Henry
0065adc298 Wrong call of show_contact into fourn/fiche.php 2013-11-13 16:37:17 +01:00
simnandez
e66371c6d1 New: Link to communities. Add official Support links 2013-11-13 16:35:02 +01:00
Peter Fontaine
844531e1d2 missing param phpdoc 2013-11-13 16:20:52 +01:00
Peter Fontaine
b965103fc3 Multiple Bank Account Number for Third Party 2013-11-13 15:40:17 +01:00
Laurent Destailleur
995bec6112 Fix: bad migration of 3.4 that make this text instead of varchar(50) 2013-11-13 15:09:22 +01:00
Florian Henry
a73275b9c1 Add prospect code client into prospect list 2013-11-13 13:17:32 +01:00
Florian Henry
4d0f554f33 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-13 13:15:56 +01:00
Laurent Destailleur
87f214dad4 Remove "realtime support" page. It was not up to date. 2013-11-13 12:47:59 +01:00
Florian Henry
8fca860a2d Add status filter on contact list 2013-11-12 15:40:00 +01:00
Raphaël Doursenaud
4ad5413163 Sync db upgrade with db install to avoid silly upgrade errors 2013-11-12 15:36:51 +01:00
Florian Henry
6bf2220a67 Add status filter into prospect and customer list 2013-11-12 15:22:11 +01:00
simnandez
d01a66ac9d Trad: Update es_ES 2013-11-12 12:43:26 +01:00
simnandez
3c097f34b8 Trad: Update es_ES 2013-11-12 12:35:45 +01:00
simnandez
84d6c96d79 Trad: Update es_ES 2013-11-12 10:55:27 +01:00
simnandez
058578c5b3 Trad: Fix bad source file 2013-11-12 10:19:12 +01:00
simnandez
3af6f683d9 Trad: Update admin.lang es_ES 2013-11-12 10:16:52 +01:00
Laurent Destailleur
2b12c492e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2013-11-11 22:29:54 +01:00
Laurent Destailleur
0ed2f4b891 Trans: Add usbek language 2013-11-11 22:25:32 +01:00
Florian Henry
5b7f2e0c53 Better nl_NL translation 2013-11-11 17:35:36 +01:00
Florian Henry
a76d5f8a1d Fix getNomURL societe 2013-11-11 16:29:35 +01:00
Florian Henry
d04f5c3148 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-11 16:24:10 +01:00
Florian Henry
53f01685e3 Display customer code (according setting) into list 2013-11-11 16:23:11 +01:00
Laurent Destailleur
b549f62e1d Merge pull request #1294 from aspangaro/develop 
Fix for document cerfa into module Don
 2013-11-10 14:59:16 -08:00
Laurent Destailleur
0dfbfbc19a Merge pull request #1293 from aspangaro/3.4 
Fix for document cerfa into module Don
 2013-11-10 14:58:39 -08:00
Laurent Destailleur
b3eec934b8 Merge pull request #1290 from atm-maxime/develop 
Fix : SQL error on margin page
 2013-11-10 14:57:42 -08:00
aspangaro
86a2da31b4 Fix for document cerfa into module Don 2013-11-10 06:52:20 +01:00
aspangaro
6b6855dff5 Fix for document cerfa into module Don 2013-11-10 06:37:08 +01:00
Laurent Destailleur
665f4ac83a Merge pull request #1289 from GPCsolutions/35b-review 
35b review
 2013-11-09 16:17:47 -08:00
Laurent Destailleur
18b55d5503 Merge pull request #1288 from GPCsolutions/35b-missingtable 
Removed unused tables from installer
 2013-11-09 16:11:31 -08:00
Laurent Destailleur
7633e46ee2 Merge pull request #1291 from defrance69/patch-18 
Update societe.class.php
 2013-11-09 16:09:23 -08:00
Laurent Destailleur
4b3778d116 Merge pull request #1292 from aspangaro/3.4 
fix for language
 2013-11-09 16:08:19 -08:00
Laurent Destailleur
238b483ad8 Merge pull request #1287 from aspangaro/develop 
Update Skype module
 2013-11-09 16:07:23 -08:00
Laurent Destailleur
d5028e3316 Add sk and lv language 2013-11-09 15:06:48 +01:00
Laurent Destailleur
4d664fee3a Add latvian and slovakian language 2013-11-09 14:11:29 +01:00
Laurent Destailleur
4b26d8441b Fix: Entry lost 2013-11-09 12:52:06 +01:00
aspangaro
bb69fcf0d7 Fix for language 2013-11-09 07:00:59 +01:00
aspangaro
9170259351 fix for language 2013-11-09 06:51:10 +01:00
Maxime Kohlhaas
2b74f03eb6 Fix : column name changed 2013-11-08 16:24:03 +01:00
Raphaël Doursenaud
594781ec62 Codestyle 2013-11-08 15:31:22 +01:00
Raphaël Doursenaud
2b29f45a43 Added class members that where declared dynamically 2013-11-08 14:42:42 +01:00
Raphaël Doursenaud
1fc2e495ba Moved unreachable statement 2013-11-08 14:42:28 +01:00
Maxime Kohlhaas
1c6edf2d03 Fix : error in replenish SQL 2013-11-08 14:07:11 +01:00
BENKE Charles
150118245f Update societe.class.php 
wrong name of outstandingbill function
 2013-11-08 13:58:48 +01:00
Maxime Kohlhaas
6d41500136 Fix : SQL error on margin page 2013-11-08 10:08:01 +01:00
Raphaël Doursenaud
b6eecb0394 Developer documentation fix 2013-11-07 22:14:43 +01:00
Raphaël Doursenaud
9faa832560 Wrong var 2013-11-07 22:11:43 +01:00
Raphaël Doursenaud
9be462e43c Text is not a type, let's use string 2013-11-07 21:48:46 +01:00
Raphaël Doursenaud
8e1fd7a083 PHP doesn't know reals, use float 2013-11-07 21:48:46 +01:00
Raphaël Doursenaud
9746702d78 FTP connections are resources 
Avoid declaring it as int
 2013-11-07 21:48:45 +01:00
Raphaël Doursenaud
e514b50d7e Typo fix 2013-11-07 21:48:45 +01:00
Raphaël Doursenaud
c845124b92 Object type is lowercase 2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
01ea84a917 Static members are not always strings 
Update method documentation to reflect the mixed type expected
 2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
d5ab0723ba Timestamp is not a type 
Timestamps are integers so let's document this correctly
 2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
74f83b235a Typecasting 
The GETPOST method returns string, let's make the typecast explicit.
 2013-11-07 21:05:39 +01:00
Raphaël Doursenaud
fa43476890 Fixed methods description 
These methods were declared void but actually returns values. Added proper documentation.
 2013-11-07 21:02:50 +01:00
Raphaël Doursenaud
9e0f8c5f57 Method is void, let's not print void 2013-11-07 21:02:21 +01:00
Raphaël Doursenaud
8907c9944d Assigments in conditions is often considered bad practice 
So let's put a comment, just in case
 2013-11-07 20:51:30 +01:00
Raphaël Doursenaud
638764f86d Moved unreachable statement to conditions 2013-11-07 20:38:06 +01:00
Raphaël Doursenaud
1f6cccc3dc Removed return from void function 
The function is declared void and the return value was not used anywhere
 2013-11-07 20:35:02 +01:00
Raphaël Doursenaud
be30cb8cbf Removed unused tables from installer 
Fixes installer bug
 2013-11-07 15:57:24 +01:00
aspangaro
6a86c31067 Update Skype Module 2013-11-07 13:17:08 +01:00
Laurent Destailleur
cf8ff25d5b Minor enhancement with link feature 2013-11-07 02:56:56 +01:00
Laurent Destailleur
a84794f9be Merge pull request #1286 from GPCsolutions/fr-fix 
French professionnal IDs for Luxembourg and Algeria
 2013-11-06 17:18:18 -08:00
Laurent Destailleur
b2308ba65c Merge pull request #1284 from GPCsolutions/links 
Links
 2013-11-06 17:15:49 -08:00
Laurent Destailleur
0c248b2667 Merge pull request #1285 from grandoc/develop 
fix language
 2013-11-06 17:08:53 -08:00
Laurent Destailleur
db9e9a3372 Prepare 3.5.0 beta 2013-11-07 00:41:27 +01:00
Agnès Rambaud
665bad1f42 French professionnal IDs for Luxembourg and Algeria 2013-11-06 19:38:26 +01:00
Laurent Destailleur
94afc84a0c Fix: price should not be lower than min price. 2013-11-06 19:31:13 +01:00
Laurent Destailleur
4c4064d7b9 Enable option to swith vat calculation mode 2013-11-06 17:45:55 +01:00
Grand Philippe
46366154ef fix language 2013-11-06 17:08:50 +01:00
Laurent Destailleur
4a29431b69 New: Add hidden option MAIN_SECURITY_HASH_ALGO to choose hash function 2013-11-06 16:32:25 +01:00
Laurent Destailleur
b82cbf1385 Fix: current balance was visible when it should not 
Conflicts:
	htdocs/compta/bank/account.php
 2013-11-06 15:35:10 +01:00
Laurent Destailleur
ab668d1b26 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-06 15:32:13 +01:00
Laurent Destailleur
521b3a89bf Fix: current balance was visible when it should not 2013-11-06 15:31:56 +01:00
Laurent Destailleur
51ad76b6de fix: minor syntax rules 2013-11-06 12:53:43 +01:00
Raphaël Doursenaud
f11f9b0a69 Added missing copyright 2013-11-06 10:33:29 +01:00
Raphaël Doursenaud
81ecb4b4a5 Updated method call to new prototype 2013-11-06 10:26:09 +01:00
Cédric Salvador
00c9df670c renamed templates 2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1 factorization 2013-11-06 10:20:54 +01:00
Cédric Salvador
c3108f452c copyrights 2013-11-06 10:20:11 +01:00
Cédric Salvador
039bd5b4c8 checkstyle 2013-11-06 10:20:11 +01:00
Cédric Salvador
70ae7b6686 facto 2013-11-06 10:20:11 +01:00
Cédric Salvador
aea668f68b checkstyle 2013-11-06 10:20:11 +01:00
Cédric Salvador
b9c36e6e0a checkstyle 2013-11-06 10:20:11 +01:00
Cédric Salvador
b74cfaf792 factorization 2013-11-06 10:19:17 +01:00
Cédric Salvador
89f9a871d0 updated migration script 2013-11-06 10:19:17 +01:00
Cédric Salvador
4d490ea02b open link in new tab 2013-11-06 10:19:17 +01:00
Cédric Salvador
b34a613504 code formating 2013-11-06 10:19:17 +01:00
Cédric Salvador
6cafe83588 translation 2013-11-06 10:19:17 +01:00
Cédric Salvador
f2535d74ea edit link lines function 2013-11-06 10:19:17 +01:00
Cédric Salvador
b158e8bb74 translations 2013-11-06 10:19:17 +01:00
Cédric Salvador
b625b1843e add a field for label input 2013-11-06 10:19:17 +01:00
Cédric Salvador
f19e5e86f4 don't try to create a link when the link input field is empty 2013-11-06 10:19:17 +01:00
Cédric Salvador
ce19b6da5c typo 2013-11-06 10:19:17 +01:00
Cédric Salvador
dcf051605a delete function for links 2013-11-06 10:19:16 +01:00
Cédric Salvador
28bfb10dbd UI 2013-11-06 10:19:16 +01:00
Cédric Salvador
c96b2d3b87 factorized form attach, documents list and links list for the document pages 2013-11-06 10:19:16 +01:00
Cédric Salvador
3529f5238b display links 2013-11-06 10:17:18 +01:00
Cédric Salvador
ae8fea2615 new attributes 2013-11-06 10:17:18 +01:00
Cédric Salvador
e8e3752626 link creation in dol_add_file_process 2013-11-06 10:17:17 +01:00