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
Laurent Destailleur
ce8d13ead0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	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/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php
 2014-02-10 00:38:10 +01:00
Laurent Destailleur
bd25a98e03 New: Generation auto of barcode is available for product. 2014-02-10 00:24:20 +01:00
Laurent Destailleur
94be4ec897 Fix: Avoid error in migration from 3.1 version. 
Fix: Suggested migration choice was ko from x.y.z to x.y.z+1
 2014-02-08 14:55:27 +01:00
Laurent Destailleur
6a84a7f935 Prepare version 3.5.1 2014-02-08 13:56:28 +01:00
Laurent Destailleur
70ab096b79 More simple specimen for test 2014-02-08 12:58:27 +01:00
Laurent Destailleur
59a25832bd Fix: Removed large comment into migration script 2014-02-08 12:16:27 +01:00
Laurent Destailleur
b94f7a6a6d Fix some amount were missing local version. 2014-02-08 03:51:30 +01:00
Laurent Destailleur
7f7222555e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-02-08 03:45:48 +01:00
Laurent Destailleur
f6f6022b7a Add eu_ES language. 2014-02-08 03:44:53 +01:00
Laurent Destailleur
fdfb7f1a8a Fix: Be sure there is no duplicate default rib. 2014-02-08 03:24:48 +01:00
Laurent Destailleur
5b89bc18f5 [ bug #1231 ] PDF always generated in interventions 2014-02-08 02:46:05 +01:00
Laurent Destailleur
aad7885bca Fix: [bug #1226 ] page ne se charge pas quand beaucoup de prospect en 
base
 2014-02-08 02:35:59 +01:00
Laurent Destailleur
b750e98d40 Fix: Pb of file upload and download. 2014-02-08 02:02:01 +01:00
Laurent Destailleur
abc8649e02 Fix: Bug of import of agenda when using https link 2014-02-08 01:16:20 +01:00
Laurent Destailleur
319b13dafb Fix: Field nature is not correctly filled. 2014-02-08 01:02:09 +01:00
Laurent Destailleur
b714347b6b Fix: Substition of extra field was ko for order. 2014-02-08 01:01:31 +01:00
Laurent Destailleur
fb789b8197 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-02-08 00:40:51 +01:00
Laurent Destailleur
56a36ba9c4 Fix: bad translation of date format for pt_BR 2014-02-08 00:36:38 +01:00
simnandez
34e73e1b7c Trad: es_ES Sync from transifex 2014-02-07 18:12:30 +01:00
Laurent Destailleur
e1880a6394 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-02-06 20:57:58 +01:00
Laurent Destailleur
43970b3bd6 Removed some TODO 2014-02-06 20:45:50 +01:00
Laurent Destailleur
80046a5310 Qual: Mutualize code 2014-02-06 20:40:01 +01:00
Laurent Destailleur
cfb9150e10 Qual: Removed a hook that is a duplicate of trigger (CRUD event must be 
enhanced by triggers, not hook).
Qual: Delete trigger must be done BEFORE delete of object, not after.
 2014-02-06 20:35:11 +01:00
Laurent Destailleur
9e06f185c5 Fix: Fix problem of invalid paypal link with \n. 2014-02-06 18:19:49 +01:00
Laurent Destailleur
d1951393c7 Fix: priority is a field smallint. 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-06 17:09:41 +01:00
Laurent Destailleur
c9b1c562cc Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-02-06 16:58:53 +01:00
Laurent Destailleur
9166dc2d8c Fix: priority is a field smallint. 2014-02-06 16:57:45 +01:00
Laurent Destailleur
e22e4fc4d7 Sync from transifex 2014-02-05 23:10:44 +01:00
Laurent Destailleur
7078970ed1 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2014-02-05 21:03:05 +01:00
Laurent Destailleur
255a1f6497 Fix: String translated twice 2014-02-05 20:57:43 +01:00
Grand Philippe
1855ba556a fix misspelled words 2014-02-05 17:53:30 +01:00
Laurent Destailleur
db006dcdf8 Fix: Missing lang->load 2014-02-05 12:52:00 +01:00
Laurent Destailleur
e3ac9db9ec Fix: Data was encode twice making bad translation for language with 
special chars.
 2014-02-05 12:11:39 +01:00
geoffrey.girard
bf6b4537b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2014-02-05 09:19:54 +01:00
geoffrey.girard
c7f8699973 correction : delete trigger must be called before the delete of object 2014-02-05 09:19:14 +01:00
Laurent Destailleur
26d134e4d8 Merge pull request #1404 from aspangaro/develop 
Add The base accountancy belgium plan for accounting - Thanks delcroip
 2014-02-04 17:10:29 -08:00
Laurent Destailleur
f50c970724 Revert "Improved translation" 
This reverts commit ec8f664085.
 2014-02-05 02:07:04 +01:00
Laurent Destailleur
d7b1fbdeec Merge pull request #1405 from ricardosequeira/develop 
Improved translation
 2014-02-04 17:04:50 -08:00
unknown
a6a26ec313 Fixed: Write note into field "note_private" in llx_facture ("note" deprecated) 2014-02-05 02:03:09 +01:00
Laurent Destailleur
579c7e8994 Merge pull request #1407 from modula71/develop 
Fixed: Write note into field "note_private" in llx_facture ("note" deprecated)
 2014-02-04 17:01:29 -08:00
Laurent Destailleur
e8dc517cba Merge pull request #1410 from aternatik/fix_ws_user 
Fix user webservice
 2014-02-04 16:49:17 -08:00
Laurent Destailleur
9a985821d2 Fix: doxygen 2014-02-04 21:08:25 +01:00
Laurent Destailleur
f8a68b0449 Fix: Missing translation 2014-02-04 20:57:22 +01:00
Laurent Destailleur
ea6a747adb Merge pull request #1408 from atm-gauthier/develop 
add hook "doActions" on supplierprice form
 2014-02-04 11:51:01 -08:00
Laurent Destailleur
d8b8f8c646 Uniformize code for contacts forms. 2014-02-04 20:49:07 +01:00
Laurent Destailleur
0da1a64335 Fix: Missing vars and bar id. 2014-02-04 20:41:23 +01:00
jfefe
1ae87887fb Fix into user webservices : better error management and country detection 
- Avoid errors when creating an user with thirdparty
- Add country detection in webservices when country_code is filled
 2014-02-04 18:03:22 +01:00
geoffrey.girard
676101b02f Add trigger on deleteline for supplier order and move trigger on deleteline for supplier invoice after delete sql query 2014-02-04 17:35:27 +01:00
geoffrey.girard
efa7a16c07 Add hook printObjectLine supplier order and supplier invoice 2014-02-04 17:30:48 +01:00
geoffrey.girard
05ceecd184 add hook printObjectLine on product supplier prices list 2014-02-04 16:55:09 +01:00
Gauthier
9cdfaa3ffe add hook "doActions" on supplierprice form 2014-02-04 10:48:35 +01:00
aspangaro
4e23a21225 Merge branch 'upstream/develop' 2014-02-03 22:08:54 +01:00
Laurent Destailleur
408a028320 Fix: Must return a string 2014-02-03 20:07:25 +01:00
Laurent Destailleur
8f3e9b1832 Fix: function must return a string 2014-02-03 20:05:56 +01:00
Laurent Destailleur
89ebb3c0ef New: Add option MAIN_DISABLE_AJAX_COMBOX 2014-02-03 19:47:35 +01:00
Laurent Destailleur
efcff80a28 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/debian/control
	htdocs/fourn/facture/paiement.php
 2014-02-03 18:44:48 +01:00
Laurent Destailleur
e5cd32623c Qual: Uniformize code of payment between customer and supplier payments. 
New: Add warning if supplier payment is higher that due amount.
 2014-02-03 18:42:24 +01:00
Laurent Destailleur
2b2d764180 Fix: ref and date of supplier invoice. 
Fix: Check on bank account
 2014-02-03 17:30:35 +01:00
unknown
d7bc52b957 Fixed: Write note into field "note_private" in llx_facture ("note" deprecated) 2014-02-03 17:25:02 +01:00
Ricardo Sequeira
ec8f664085 Improved translation 
Portuguese translation
 2014-02-02 18:45:51 +00:00
Laurent Destailleur
77b3c9d2eb Fix: Bad constant 2014-02-02 19:00:56 +01:00
aspangaro
bccf23711d Kill clics - Accountancy in product card - Not display accountancy_code when module (comptabilite | accounting | accounting expert) is disabled 2014-02-02 18:26:17 +01:00
Ricardo Sequeira
dea829a3cf Improved translation 
holiday translation
 2014-02-02 17:21:08 +00:00
aspangaro
05c8039cf9 Delete rowid in case of an other accountancy plan already exist. 2014-02-02 09:50:53 +01:00
aspangaro
fda0dec260 Add The base accountancy belgium plan for accounting - Thanks delcroip 
http://www.dolibarr.fr/forum/12-howto--aide/47966-pcmn-plan-comptable-minimum-normalise-belgique
 2014-02-02 06:45:05 +01:00
Laurent Destailleur
2d15e2c759 Fix: Link on supplier in document invoice must go to supplier card. 2014-02-01 16:31:23 +01:00
Laurent Destailleur
7de0438299 Fix: Link on supplier in document invoice must go to supplier card. 2014-02-01 16:26:41 +01:00
BENKE Charles
b86322c14a Update commonobject.class.php 
hook module need extrafields parameter too
 2014-02-01 12:55:05 +01:00
Laurent Destailleur
9aaafde6d5 Fix: Pb with cache files for graphical boxes: 
Missing year into cache id.
User with restrcited permission on thirdparty must not share same cache
files that "see all" users.
 2014-01-31 18:48:57 +01:00
Laurent Destailleur
ba931e18d4 Work on barcode number generation. 
Normalize code for barcode module.
 2014-01-31 18:12:54 +01:00
Laurent Destailleur
40a53d4b57 Fix: used bad constant name 2014-01-31 16:06:28 +01:00
Laurent Destailleur
28b252849f Fix: W3C 2014-01-31 13:02:48 +01:00
Laurent Destailleur
7f15aa4582 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-01-31 11:41:17 +01:00
Laurent Destailleur
1b88ab2355 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/contact/class/contact.class.php
 2014-01-31 10:12:41 +01:00
Laurent Destailleur
5b218c3c5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-01-31 10:10:38 +01:00
Laurent Destailleur
bb7fc8631b Qual: Uniformize index name to match 
http://wiki.dolibarr.org/index.php/Language_and_development_rules#SQL_rules
 2014-01-31 10:08:25 +01:00
Laurent Destailleur
a2afea7ba9 Work on barcode number generation. 
Normalize code for barcode module.
 2014-01-30 18:21:04 +01:00
Laurent Destailleur
c5d5d6a8d6 A better fix to have default statut to enabled when created an address. 2014-01-30 18:17:52 +01:00
Laurent Destailleur
d15aeb268f Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-30 18:12:31 +01:00
Laurent Destailleur
47ff6a68bb Fix: Test were inverted. 2014-01-30 18:11:40 +01:00
simnandez
17581dd6d6 Fix: Default status into contact creation must be Actif 2014-01-30 12:21:58 +01:00
simnandez
ee72a9a4e6 Fix: Default status into contact creation must be Actif 2014-01-30 12:20:36 +01:00
Laurent Destailleur
85436f871c Sec: Missing permission tests 2014-01-30 11:48:14 +01:00
Laurent Destailleur
0e9477167d Fix: Bad output of extrafields when list is used. 2014-01-30 11:47:25 +01:00
Laurent Destailleur
8abde9e11f Sec: Missing permission tests 2014-01-30 11:44:31 +01:00
Laurent Destailleur
5076e8ce4e Fix: Bad output of extrafields when list is used. 2014-01-30 10:48:10 +01:00
Laurent Destailleur
8d86778a66 Merge pull request #1400 from jfefe/fix_migr 
Fix : bad sql request during migration
 2014-01-29 16:52:52 -08:00
Laurent Destailleur
470f88bacd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-01-30 01:43:44 +01:00
Laurent Destailleur
bd3a64d580 Add test ($conf->global->FEATURES_LEVEL >= 2) for extrafields on 
detailed lines because this feature is currently bugged.
Should work when the 2 forms (predefined product and free product) will
be merged into one (planned for 3.6)
 2014-01-30 01:35:01 +01:00
Laurent Destailleur
d6c4fa5fe3 Qual: Normalize code 2014-01-30 00:40:00 +01:00
Jean-François Ferry
a0c3527e30 Fix : bad sql request during migration 2014-01-29 19:19:23 +01:00
BENKE Charles
a10ccb4d92 Update objectline_add.tpl.php 
Adding extra fields on line of element
 2014-01-29 16:45:37 +01:00
Florian Henry
779aaa51ab reset function2.lib.php to orign 2014-01-29 10:13:00 +01:00
Florian Henry
526c383f10 Add complete head into agenda 2014-01-29 10:11:39 +01:00
Florian Henry
ca556485e0 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-29 10:09:44 +01:00
Laurent Destailleur
ebd8d5f8dd New: Can input barcode during product creation step. 2014-01-28 19:11:22 +01:00
Laurent Destailleur
7c01fd98b3 Fix: use allowed database types 2014-01-28 15:45:00 +01:00
Laurent Destailleur
1ec53873f3 Fix: Missing date start and end when creating contracts 2014-01-28 15:28:23 +01:00
Laurent Destailleur
5657bd7793 New: Can create contract from an order. 2014-01-28 15:26:20 +01:00
Laurent Destailleur
954cd74ffb Fix: Missing date start and end when creating contracts 2014-01-28 15:24:30 +01:00
Laurent Destailleur
0d0fda8fae Merge pull request #1382 from atm-geoffrey/develop 
Add new doActions and formObjectOptions hook on supplier prices page
 2014-01-27 01:43:08 -08:00
Alexis Algoud
b2477b6764 Regression in contact form on Note field 
It's seems to be a regression to Note field in 3.3 instead of public and private Note introduced in 3.4 (and confirmed in the class -> Note / / deprecated)
 2014-01-27 10:36:59 +01:00
Laurent Destailleur
3efd44fd28 Fix: Enabled in dev mode only 2014-01-26 23:23:36 +01:00
Laurent Destailleur
9cf745b127 Sync with transifex 2014-01-26 23:12:25 +01:00
Laurent Destailleur
0d01155453 Fix: Bad translation 2014-01-26 21:01:32 +01:00
Laurent Destailleur
ee41273286 Fix: Count of files were wrong 2014-01-26 19:27:42 +01:00
Laurent Destailleur
cd277aaf12 Fix: Missing translation 2014-01-26 19:10:05 +01:00
Laurent Destailleur
f83b47be9f Fix: Missing loading lang files. 2014-01-26 18:43:30 +01:00
Laurent Destailleur
557fb0a9b1 Fix: miscellaneous css problems 
Fix: Version was missing into home page when login was already done.
 2014-01-26 18:30:45 +01:00
Laurent Destailleur
549f5c8426 Fix: Not existing file 2014-01-26 17:01:14 +01:00
Laurent Destailleur
1bdeb171c7 Fix: Missing class 2014-01-26 01:33:16 +01:00
Laurent Destailleur
f50ad96beb Fix: var init at wrong place 2014-01-25 23:14:57 +01:00
Laurent Destailleur
1a35fb801a Fix: var init at wrong place 2014-01-25 23:14:25 +01:00
Laurent Destailleur
0a367f03a0 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-25 16:29:19 +01:00
Laurent Destailleur
7149fd76c7 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2014-01-25 16:28:21 +01:00
Laurent Destailleur
98805ace4a Fix: Error management when deleting a payment on supplier invoice. 2014-01-25 00:30:03 +01:00
Laurent Destailleur
7986c95ce3 Fix: Error management when deleting a payment on supplier invoice. 2014-01-25 00:26:42 +01:00
Laurent Destailleur
372acbfb0d Fix: Error management when deleting a payment on supplier invoice. 2014-01-25 00:25:42 +01:00
Laurent Destailleur
8d916215cc New: Add new hook function addMoreActionsButtons to allow a module to 
add/replace action buttons into an element.
 2014-01-24 12:51:01 +01:00
Laurent Destailleur
101151630d Fix: doxygen errors 2014-01-24 10:38:45 +01:00
Laurent Destailleur
bdbbb580f8 Merge pull request #1381 from altairis-fr/clonepropal 
clone of propal improvements
 2014-01-24 01:33:15 -08:00
Laurent Destailleur
bb1575e0e6 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-24 10:20:03 +01:00
Laurent Destailleur
7254aecbb7 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-23 20:03:25 +01:00
Laurent Destailleur
21b43d7604 Fix: if module invoice is disabled, option to automatically classify 
order as billed does not exists, so "Classify billed" for order must be
done manually from order card.
 2014-01-23 20:02:19 +01:00
simnandez
714be2cd62 Trad: Add missing ca_ES and es_ES files 2014-01-23 17:05:51 +01:00
simnandez
21d6e22f03 Trad: Add missing ca_ES and es_ES files 2014-01-23 17:05:07 +01:00
simnandez
a059b66b7d Fix: box of bank balances lines without decimals 2014-01-23 16:27:34 +01:00
simnandez
6fed307d70 Fix: box of bank balances lines without decimals 2014-01-23 16:26:07 +01:00
simnandez
72752f9a30 Fix: Bad navigation into stock product tab 2014-01-23 16:01:27 +01:00
simnandez
cd1313280c Fix: Bad navigation into stock product tab 2014-01-23 16:00:15 +01:00
Grand Philippe
2f2668d41f typo 2014-01-23 12:25:25 +01:00
Juanjo Menent
f634427f73 Merge pull request #1390 from grandoc/3.5 
typo
 2014-01-23 03:22:57 -08:00
simnandez
2866deb3c4 Thousand separator must be space into Spain 2014-01-23 12:18:57 +01:00
simnandez
35051f8c77 Thousand separator must be space into Spain 2014-01-23 12:18:15 +01:00
Maxime Kohlhaas
db90776400 Thousand separator has been set to None instead of space 2014-01-23 12:16:38 +01:00
Juanjo Menent
4c64767e7b Merge pull request #1392 from atm-maxime/3.5 
Thousand separator has been set to None instead of space
 2014-01-23 03:14:57 -08:00
Laurent Destailleur
ce24a7e9ad Fix: Bad error management making rollback instead of commit 2014-01-23 09:20:06 +01:00
Laurent Destailleur
9e7f3686db Fix: No message if module mailman disabled 2014-01-23 09:19:56 +01:00
Laurent Destailleur
5cfaca4942 Fix: Bad error management making rollback instead of commit 2014-01-23 09:19:15 +01:00
Maxime Kohlhaas
4f5441dc81 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2014-01-23 09:07:48 +01:00
Maxime Kohlhaas
eb7d802a8f Thousand separator has been set to None instead of space 2014-01-23 09:07:15 +01:00
Laurent Destailleur
82bc9e709b Fix: No message if module mailman disabled 2014-01-23 08:54:39 +01:00
geoffrey.girard
7f59def98b Correction trigger on update product buyprice 2014-01-22 10:44:23 +01:00
philippe
021f6e90e2 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-22 08:09:44 +01:00
Laurent Destailleur
9341db3e86 Fix: Missing id 2014-01-22 03:20:18 +01:00
Grand Philippe
8a0bddf4c5 typo 2014-01-21 18:55:45 +01:00
Christophe Battarel
81bae5fff9 fix wrong constant usage 2014-01-21 18:33:25 +01:00
Laurent Destailleur
8666524446 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-01-21 15:28:18 +01:00
Laurent Destailleur
8cdd0502b7 Fix: Syntax error 2014-01-21 15:27:32 +01:00
Florian Henry
a7c892e23b Fix Mask numbering 2014-01-21 14:18:00 +01:00
Laurent Destailleur
f3774cc5e1 Merge pull request #1385 from defrance69/patch-24 
Update fournisseur.class.php
 2014-01-21 05:05:20 -08:00
Laurent Destailleur
b8aee5f462 Merge pull request #1388 from FHenry/3.4 
Correction Reset Mask (before do not work with FA{yy}{mm}-{0000@99} with date 2014-01-01)
 2014-01-21 04:59:43 -08:00
Florian Henry
cd84a5fd17 remove debug 2014-01-21 13:48:47 +01:00
Florian Henry
79c2e31439 Fix mask 2014-01-21 13:47:48 +01:00
Laurent Destailleur
2c0c3ce241 Merge pull request #1383 from atm-maxime/develop 
Allow to clone an invoice on a different third
 2014-01-21 04:46:18 -08:00
Laurent Destailleur
3852fe4a1c Merge pull request #1380 from atm-alexis/3.5 
Add right to export project in export tool
 2014-01-21 04:30:35 -08:00
Laurent Destailleur
0a372a1c7d Merge remote-tracking branch 'origin/3.5' into develop 2014-01-21 13:26:05 +01:00
Laurent Destailleur
9519c89110 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-01-21 13:23:27 +01:00
Léo
46926aa685 Fix: modBarcode issue with blank list in conf (?) 
Custom DB prefix not working with barcode module ? Might help.
 2014-01-21 13:19:32 +01:00
Laurent Destailleur
d7e111b3bd Fix: Missing parent tables 2014-01-21 13:18:30 +01:00
Laurent Destailleur
8bd2a1bc32 Merge pull request #1384 from Pfontaine/fix/societe2contact_civilite 
Fix: add civilite_id field in contact when create new third party.
 2014-01-21 04:12:47 -08:00
Laurent Destailleur
709edca05c Merge pull request #1386 from zongap/patch-1 
Fix: modBarcode issue with blank list in conf (?)
 2014-01-21 04:11:32 -08:00
Florian Henry
163fcc8179 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-21 12:58:47 +01:00
Florian Henry
398e286be9 Fix reset Mask (befor do not work with FA{yy}{mm}-{0000@99} and date 
2014-01-01)
 2014-01-21 12:58:25 +01:00
Florian Henry
57f8f30494 Correction Reset Mask (before do not work with FA{yy}{mm}-{0000@99} with 
date 2014-01-01)
 2014-01-21 12:57:32 +01:00
Laurent Destailleur
23e6709164 Better error message 2014-01-21 12:55:05 +01:00
Laurent Destailleur
cfd8601a70 Fix: Missing parent tables 2014-01-21 12:53:27 +01:00
Maxime Kohlhaas
60e616f63e Fix : big bug while importing thirds, codes were not properly set or not imported 2014-01-21 10:29:35 +01:00
Maxime Kohlhaas
06bbc48399 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-01-21 09:03:25 +01:00
Léo
6c00fc33f2 Fix: modBarcode issue with blank list in conf (?) 
Custom DB prefix not working with barcode module ? Might help.
 2014-01-21 00:54:26 +01:00
Laurent Destailleur
e85cf332b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-01-20 17:34:40 +01:00
Laurent Destailleur
062230050f New: Can call back barcode number from a product ref or thirdparty ref. 2014-01-20 17:18:56 +01:00
Laurent Destailleur
30aae38efa Removed POST usage. 2014-01-20 14:23:37 +01:00
Laurent Destailleur
70debe9d9f Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-01-20 11:25:58 +01:00
Laurent Destailleur
5b6b8f1d5b Fix: Support for reset everymonth (@99 into numbering mask) was ko when 
changing year.
 2014-01-20 11:20:38 +01:00
Laurent Destailleur
8d8e016115 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00
Laurent Destailleur
8642e2027c Fix: [ bug #1212 ] 'jqueryFileTree.php' directory traversal 
vulnerability
 2014-01-20 02:10:16 +01:00
Laurent Destailleur
0ba82d3c6e Fix: Missing test on id 2014-01-20 01:27:40 +01:00
Laurent Destailleur
1ebd56c4ee New: Add option MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE 2014-01-20 00:40:01 +01:00
Laurent Destailleur
699a079ed7 New: Add option MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES and 
MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES to automatically add
timestamp and user line into editionf field when editing a note.
 2014-01-20 00:31:32 +01:00
Laurent Destailleur
73be349233 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-19 23:47:58 +01:00
Laurent Destailleur
5f58bff981 Use _ instead of - for option SUPPLIER_REF_IN_NAME 2014-01-19 22:59:37 +01:00
Laurent Destailleur
6253385b17 Fix: Thumbs was not visible when file was uploaded with extension in 
upper case.
 2014-01-19 22:51:24 +01:00
Laurent Destailleur
123cd787f5 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-19 22:44:34 +01:00
Laurent Destailleur
79e4c283db Fix: Deletion of files was broken 2014-01-19 22:43:36 +01:00
Laurent Destailleur
cbf6e8563d New: Add option SUPPLIER_REF_IN_NAME 2014-01-19 22:00:02 +01:00
Laurent Destailleur
becd65f9d3 Fix: Bad space into log 2014-01-19 21:34:48 +01:00
BENKE Charles
0d80d9331f Update fournisseur.class.php 
wrong object
 2014-01-19 15:44:58 +01:00
Peter Fontaine
919a7cd4a6 Fix: add civilite_id field in contact when create new third party. 2014-01-19 14:21:11 +01:00
Laurent Destailleur
c7a73e4e00 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 12:57:13 +01:00
Laurent Destailleur
22767bac36 Fix: Missing the version into url 2014-01-18 12:51:27 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Laurent Destailleur
4074547589 Fix;: Pb of caching static resource (js and css). Add a workaround to 
avoid any problems.
 2014-01-18 00:50:21 +01:00
Maxime Kohlhaas
7e8a7f7e7f Allow to clone an invoice on a different third 2014-01-17 15:44:06 +01:00
geoffrey.girard
8729790016 Add trigger on update product buyprice 2014-01-17 10:38:18 +01:00
geoffrey.girard
e418e10df0 Add new doActions hook on supplier prices page 2014-01-17 09:45:57 +01:00
Laurent Destailleur
031fd2f8b8 Fix: No set focus 2014-01-17 03:25:31 +01:00
Christophe Battarel
7d04944ca7 don't reset ref_client if same customer and MAIN_KEEP_REF_CUSTOMER_ON_CLONING 2014-01-16 11:48:48 +01:00
Christophe Battarel
687fc1798b on clone of propal, copy contact informations 2014-01-16 11:43:59 +01:00
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