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

42407 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
9a33d67527 Update doc 2014-01-08 00:07:05 +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
923ff008c2 Update doc 2014-01-07 19:16:44 +01:00
Laurent Destailleur
0876e2cf3f Qual: Add phpunit test for paypal module 2014-01-07 17:48:01 +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
Maxime Kohlhaas
2225c21aae Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-01-07 11:27:39 +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