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

32489 Commits

Author SHA1 Message Date
Juanjo Menent
37e3455f82 Merge pull request #1191 from FHenry/3.4 
Fix: Link "Show all supplier invoice" on suplier card not working
 2013-08-22 23:59:16 -07:00
Florian Henry
4f991da846 Fix: Link "Show all supplier invoice" on suplier card not working 2013-08-22 15:11:11 +02:00
Christophe Battarel
32dd1e4480 fix display of buying price on line edit when no supplier price is defined 2013-08-22 10:45:42 +02:00
Laurent Destailleur
05040d1997 Fix: B1032-develop: Problem in the filter of Contact by company category 2013-08-21 22:42:08 +02:00
Christophe Battarel
dd32dbacb5 Fix retrieving of margin info when invoice created automatically from order (used by workflow module) 2013-08-21 18:55:11 +02:00
Florian Henry
71ec4ea31c Merge remote-tracking branch 'origin/3.4' into 3.4 
Conflicts:
	ChangeLog

Change-Id: I325ab3266300286664f4790b5f2314255ac1911d
 2013-08-21 17:32:52 +02:00
Florian Henry
ba4fde20ce Fix UserGroup name not display in card view or edit 2013-08-21 17:03:13 +02:00
Juanjo Menent
b6d998d1c5 Merge pull request #1185 from altatof/3.4 
fix old bug on reordering supplier products in list
 2013-08-21 06:27:22 -07:00
Christophe Battarel
9ac22149d4 fix old bug on reordering supplier products in list 2013-08-21 15:18:00 +02:00
simnandez
4e34e7b71c Fix: [ bug #1037 ] Consumption> Supplier invoices related 2013-08-21 12:06:02 +02:00
Grand Philippe
49e38e1263 fix some trad 2013-08-16 10:16:06 +02:00
Florian Henry
60b3f61339 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 
Conflicts:
	ChangeLog
 2013-08-13 12:13:47 +02:00
Florian Henry
d6c7ac5f73 Fix canvas feature broken 2013-08-13 09:16:39 +02:00
Florian Henry
da565b2c7f Change-Id: I3d7bc928bf2428e4a96c61fd9d22e8235792dfe7 2013-08-12 19:43:51 +02:00
simnandez
067c8c55b9 Fix: [ bug #1033 ] SUPPLIER REF disappeared 2013-08-12 18:42:01 +02:00
Florian Henry
26d1352de4 Fix update extrafield do not display immediatly 2013-08-12 14:30:42 +02:00
Laurent Destailleur
34987d3e8b Exclude conf.php file from git 2013-08-10 13:02:13 +02:00
Florian Henry
75701ee995 Fix: Supplier invoice and supplier order are not displayed into object 
link into agenda event card
 2013-08-09 13:11:18 +02:00
simnandez
b9e1a57f67 Fix: [ bug #1029 ] Tulip numbering mask 2013-08-08 10:00:06 +02:00
Laurent Destailleur
0f86755033 Fix: Found a dozen of bugs into sub module delivery of module shipment. 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
 2013-08-07 15:29:13 +02:00
Laurent Destailleur
23516a466c Fix: Pb with predefined invoices 2013-08-06 23:56:13 +02:00
Laurent Destailleur
f57aaf4f4a Fix: Do not load class like it should 2013-08-06 22:58:26 +02:00
Laurent Destailleur
4346a3f90f Fix: Param must be a regex string 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-08-06 19:34:13 +02:00
Laurent Destailleur
c3dd7c3b39 Fix: Tons of regression after renaming note field into note_private. 2013-08-06 13:22:35 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
784c8acaf7 Trans: Upgrade language file 2013-08-05 23:27:13 +02:00
Laurent Destailleur
4ec86717be Fix: Bad char % 2013-08-03 15:51:32 +02:00
Laurent Destailleur
3730d874c9 Fix: [ bug #991 ] Error when adding a product in POS when no Tax is 
associated to the country of the company
 2013-08-01 18:09:01 +02:00
Laurent Destailleur
8b0169f468 Fix: [ bug #991 ] Error when adding a product in POS when no Tax is 
associated to the country of the company
 2013-08-01 18:01:25 +02:00
Laurent Destailleur
d8778ce0f7 Fix: [ bug #1010 ] change index.php to list.php in fourn/fiche 2013-08-01 17:52:21 +02:00
Laurent Destailleur
1fb8baa92e Fix: [ bug #1009 ] ZipArchive' not found 2013-08-01 16:56:17 +02:00
Laurent Destailleur
4786c90c4a Fix: Pb into export descriptions 2013-08-01 15:30:27 +02:00
Laurent Destailleur
bd33e8a962 Fix: Export of country 2013-08-01 15:28:19 +02:00
Laurent Destailleur
ba2c6d4d54 Fix: Confirm boxes with jmobile 2013-08-01 05:13:13 +02:00
Laurent Destailleur
c4ebdf18e7 Fix: search on contract ref 2013-07-31 11:22:52 +02:00
Laurent Destailleur
ecfca853a1 Fix: Search on contract ref 2013-07-31 11:21:05 +02:00
Florian Henry
4d3738410e update no_email column on unsubcribe link for contact 2013-07-30 15:18:19 +02:00
Florian Henry
21bdabc248 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-07-30 14:19:05 +02:00
Florian Henry
3bc7d3c877 Fix extrafeild thirdparty import and export 2013-07-30 14:18:56 +02:00
Laurent Destailleur
1c24f9e35e Merge pull request #1138 from atm-maxime/3.4 
Fix : Numbering on supplier invoice was not saved and on shipment displa...
 2013-07-30 03:22:29 -07:00
Maxime Kohlhaas
f9c2910f84 Fix : Numbering on supplier invoice was not saved and on shipment displayed error when ok 2013-07-30 09:21:45 +02:00
Florian Henry
d6f31d61bf Fix Typhon model $mysoc global is missing 2013-07-29 12:21:52 +02:00
Florian Henry
bbaa344801 Defaulted PDF model document with default value (set in admin) for 
Shipping and delivery
 2013-07-29 12:17:24 +02:00
Laurent Destailleur
3c6b1f17d1 Fix: print of a function that already contains the print. 2013-07-27 14:10:57 +02:00
Laurent Destailleur
14dfbfc40c Fix: W3C (form into tr make some browsers crazy) 2013-07-27 13:29:06 +02:00
Laurent Destailleur
385d3612c5 Merge pull request #1136 from jfefe/extrarequired 
Missing checks on extrafields
 2013-07-27 03:09:44 -07:00
Laurent Destailleur
3cd46d5e20 Merge pull request #1134 from FHenry/3.3 
Fix [ bug #1001 ] Charge sociale : état incorrect
 2013-07-27 02:38:56 -07:00
Laurent Destailleur
60dc7793ff Merge pull request #1132 from FHenry/3.4 
Fix [ bug #990 ] Filter + sort does not work on order list
 2013-07-27 01:32:30 -07:00
Laurent Destailleur
ae9c3cd780 Prepare 3.3.4 2013-07-26 16:43:06 +02:00
jfefe
7ee4e42710 Check required extrafields on orders 2013-07-26 16:04:09 +02:00
jfefe
bddbc6f6b2 Fix : show input fields if missing required extrafield when editing 
invoice
 2013-07-26 16:02:48 +02:00
jfefe
020c0f33a0 Check required extrafields on proposals 2013-07-26 15:42:32 +02:00
jfefe
473541f19d Fix : bad test field when checking extrafield is required 2013-07-26 15:41:17 +02:00
Laurent Destailleur
d0af692ed5 Fix: date must be reported according to user timezone 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-07-26 15:23:41 +02:00
Laurent Destailleur
f2f8d60f19 Fix: date must be reported according to user timezone 2013-07-26 15:21:32 +02:00
jfefe
371b40cc76 Do not create invoice if required extrafields are empty 2013-07-26 13:22:22 +02:00
jfefe
c431fc716f Check if an required extrafield is filled. 
Method setOptionalsFromPost now return -1 if required field is blank
 2013-07-26 13:18:23 +02:00
Florian Henry
8721b7cfa7 Fix [ bug #1001 ] Charge sociale : état incorrect 2013-07-26 12:51:28 +02:00
Florian Henry
116988febd Fix [ bug #1001 ] Charge sociale : état incorrect 2013-07-26 12:49:11 +02:00
Florian Henry
e82b8e9b9e Fix [ bug #990 ] Filter + sort does not work on order list 2013-07-26 12:16:39 +02:00
jfefe
95bc40d0df Missing attribute to indicate required fields 2013-07-26 08:51:22 +02:00
Laurent Destailleur
3ecb9c2dd8 Merge pull request #1130 from FHenry/3.4 
Avoid php warning if extrafield "list from table" have bad settings
 2013-07-25 13:40:09 -07:00
Laurent Destailleur
fe079f71da Merge remote-tracking branch 'origin/3.3' into 3.4 2013-07-25 21:53:38 +02:00
Florian Henry
2f112efad5 Avoid php warning if extrafield list from table have bad settings 2013-07-25 20:18:45 +02:00
Laurent Destailleur
16d530b22d Fix: Watermark make pagebreak crazy. 2013-07-25 18:58:47 +02:00
Laurent Destailleur
6b1b6b4fee Fix: Color no more lost 2013-07-24 20:20:10 +02:00
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
 2013-07-24 15:25:00 +02:00
Juanjo Menent
9babb6cc4a Merge pull request #1129 from FHenry/3.4 
Fix bug export contact extrafields
 2013-07-24 06:18:00 -07:00
Laurent Destailleur
7cf429d238 Fix: Color change on page break. 2013-07-24 15:04:09 +02:00
Florian Henry
f11d477770 Fix bug export contact extrafields 2013-07-24 13:28:02 +02:00
Laurent Destailleur
2f2f2b66c4 Fix: creation of thumbs not working 2013-07-24 11:26:09 +02:00
Laurent Destailleur
15c4c5d6b9 Some fixes into css 2013-07-23 20:48:37 +02:00
Laurent Destailleur
df27538d74 Merge pull request #1122 from FHenry/3.4 
Avoid PHP warning
 2013-07-23 09:31:16 -07:00
Laurent Destailleur
8f39d30ea5 Fix: Bad parameter 2013-07-23 18:22:10 +02:00
Florian Henry
6f262b3a5b Avoid PHP warning 2013-07-23 15:52:41 +02:00
Laurent Destailleur
361f3a638a Fix: W3C 2013-07-23 15:24:34 +02:00
Laurent Destailleur
d5ca2f9f40 Fix: forged select for stats where wrong when filtering on a thirdparty 
Conflicts:
	htdocs/compta/facture/class/facturestats.class.php
 2013-07-18 15:37:14 +02:00
Florian Henry
4fee61beb0 Fix adding email into mailing module 
source_id is already added
 2013-07-16 21:34:24 +02:00
Laurent Destailleur
2ae1e787c9 Fix: Bad date ranges 
Conflicts:
	scripts/invoices/rebuild_merge_pdf.php
 2013-07-15 21:49:54 +02:00
Laurent Destailleur
5fb707f918 Fix: Restore disappeared feature 2013-07-14 21:02:00 +02:00
Laurent Destailleur
446cc162cd Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/compta/facture/impayees.php
 2013-07-14 20:33:54 +02:00
Laurent Destailleur
c24659b3a5 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-07-14 20:29:25 +02:00
Laurent Destailleur
dc5ad1a0f3 Fix: Total missing 2013-07-14 20:29:07 +02:00
Laurent Destailleur
f4dfac045a Fix: Bad default mysql driver 2013-07-14 20:20:52 +02:00
Laurent Destailleur
0a3bd58645 Fix: Duplicate button 2013-07-14 03:28:19 +02:00
Laurent Destailleur
57ab24baca Fix: bad sort order into ecm module 2013-07-14 01:10:23 +02:00
Laurent Destailleur
154cd1fcf9 Fix: Sort on ref for supplier invoice into ged 2013-07-14 01:10:18 +02:00
Laurent Destailleur
460778818c Fix: automatic ecm for supplier invoices 2013-07-14 01:10:11 +02:00
Laurent Destailleur
55d14f430c Fix: Search on supplier ref 2013-07-13 23:36:21 +02:00
Laurent Destailleur
73a33a6dae Fix: Bug to delete bank line 2013-07-13 17:56:23 +02:00
simnandez
11bf611618 Trad: Fix ca_ES and es_ES missing translation 2013-07-11 11:50:31 +02:00
Laurent Destailleur
548ea4f93f Fix: Navigation 2013-07-10 23:58:49 +02:00
Laurent Destailleur
f2281a4e58 Merge pull request #1086 from FHenry/3.4 
remove pgsql warning on date insert
 2013-07-10 06:40:31 -07:00
simnandez
50395fc8c4 Fix: Regression in options MAIN_PROFIDx_IN_ADDRESS 2013-07-10 15:32:29 +02:00
Florian Henry
729cef3eb4 Qual: Return id of order creates instead of 1 with method 
createFromProposal
 2013-07-10 13:32:42 +02:00
Florian Henry
44cd024f89 Fix bug on from_confrim using ajax and radio button question type 2013-07-10 13:10:32 +02:00
Florian Henry
b9bfccd0e2 fix pgsql warning date 2013-07-10 10:35:10 +02:00
Laurent Destailleur
a60cc916f6 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-07-10 10:34:56 +02:00
Florian Henry
4aa966f7ad remove pgsql warning on date insert 2013-07-10 10:30:33 +02:00
Laurent Destailleur
f4428c8a8a Fix: Bad link 2013-07-09 15:27:06 +02:00
Laurent Destailleur
0b28ab9dde Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-07-09 00:36:12 +02:00
Laurent Destailleur
aa628fb47a Fix help 2013-07-09 00:35:55 +02:00
Florian Henry
3db195cb48 [ bug #971 ] html.form.class.php select_contact with autocomplete do not 
exclude id from exclude array
 2013-07-08 12:51:17 +02:00
Florian Henry
b1b68eafe3 [ bug #972 ] Auto completion contact field do not take account the min 
caract number before search
 2013-07-08 12:47:07 +02:00
Laurent Destailleur
05461c47cc Fix: vat rate for slovenia 2013-07-07 23:22:00 +02:00
Laurent Destailleur
0de1fe893a Prepare 3.4 2013-07-07 13:30:30 +02:00
Florian Henry
1e089ef74a Reset demo webservice to NORUN 2013-07-05 09:19:56 +02:00
simnandez
df26037e9d Trad: Load contracts lang for stats panel 2013-07-03 16:49:54 +02:00
simnandez
66ce0582a1 Trad: Fix missing = into es_ES admin.lang 2013-07-03 16:42:53 +02:00
Regis Houssin
7e70d935b6 Fix: change for use url of image 2013-07-03 16:07:31 +02:00
simnandez
64a04ef150 Trad: Add missing trans before 3.4 final release 2013-07-03 12:14:37 +02:00
simnandez
c9fd070bba Fix: Amarok Tab visu. 2013-07-02 18:53:42 +02:00
Laurent Destailleur
8d7a058a67 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-07-02 09:59:04 +02:00
Laurent Destailleur
1beb50e870 Fix: State for turkey 2013-07-02 09:58:09 +02:00
Laurent Destailleur
46c3b1eb1f Missing vat rate 2013-07-02 01:26:52 +02:00
Laurent Destailleur
443d6d4405 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-07-01 22:44:53 +02:00
Laurent Destailleur
154daa0657 Fix: css 2013-07-01 21:52:09 +02:00
Raphaël Doursenaud
a4fe6a40bf Fixed missing class include 2013-07-01 17:45:44 +02:00
Laurent Destailleur
59c97afeed Fix: Bad calculation. Missing global. 2013-07-01 02:10:22 +02:00
Laurent Destailleur
134187ef94 Fix: Overlapping of company name. 
Fix: Missing state for ome countries.
 2013-07-01 00:08:44 +02:00
Laurent Destailleur
4f84b1e774 Fix: Bad error management 2013-06-28 17:55:48 +02:00
Laurent Destailleur
1168a43bfe Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-28 17:54:23 +02:00
Laurent Destailleur
ee8f3cbbe5 Fix: css when using checkbox into label 2013-06-28 17:50:10 +02:00
Laurent Destailleur
dc22b5a50a Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/mailings/modules_mailings.php
 2013-06-28 00:24:13 +02:00
Laurent Destailleur
3f2730a2ad Merge pull request #1072 from jfefe/extra_soc 
Fix : bad element type name for company extrafields into export
 2013-06-27 14:40:30 -07:00
Laurent Destailleur
9dea1e54ef Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-27 18:38:06 +02:00
Laurent Destailleur
1223d7c3d0 Fix: Civility field must be blank if not defined. 2013-06-27 18:37:09 +02:00
Florian Henry
469e700895 Fix bug pgsql : add mail directly into mailling 2013-06-27 14:35:41 +02:00
jfefe
b513bd7b84 Fix : bad element type name for company extrafields into export 2013-06-27 14:30:49 +02:00
Laurent Destailleur
9a5b55219a Fix: CSS 2013-06-26 14:40:29 +02:00
Laurent Destailleur
8311b83861 Fix: css 2013-06-26 11:41:18 +02:00
Laurent Destailleur
b3bdc76da3 Trans: More complete examples 2013-06-26 00:05:00 +02:00
Laurent Destailleur
8359a34545 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
 2013-06-25 21:31:24 +02:00
Laurent Destailleur
2af8f295b1 Fix: warning not always visible. Depends if addon modules were 
installed. Var should provide a quick fix.
 2013-06-25 21:25:09 +02:00
Laurent Destailleur
187feff7d5 Prepare 3.3.3 2013-06-25 20:40:22 +02:00
Laurent Destailleur
0ec4b3bcdb Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-25 18:10:55 +02:00
Laurent Destailleur
285ea8da3f More info into log 2013-06-25 15:47:59 +02:00
jfefe
54bf3fd516 Add parameter to force user in dol_check_access_document function 
This required by webservice where global $user is not available
 2013-06-25 15:09:51 +02:00
Laurent Destailleur
c2654fa7e2 Fix: Bad translation. Must use a different string than products 2013-06-25 15:00:10 +02:00
simnandez
065b30f0d0 [Bug #958] LocalTax2 for Spain fails on Suppliers 2013-06-25 11:12:21 +02:00
Laurent Destailleur
7f3a06127a Fix: Bad regex 2013-06-24 19:55:23 +02:00
Laurent Destailleur
eb07c6b2e7 Fix: Missing left padding 2013-06-24 19:45:29 +02:00
Laurent Destailleur
8d04f5a805 Fix: warning 2013-06-24 19:36:10 +02:00
Regis Houssin
307ae65924 Fix: crlf to lf for avoid errors with git clone 2013-06-24 17:43:27 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Regis Houssin
cb9dcfa369 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-24 17:13:39 +02:00
Regis Houssin
aa7e61178a New: add product price sharing for multicompany 2013-06-24 17:13:08 +02:00
Laurent Destailleur
7fb8a740e7 Fix: bad function 2013-06-23 18:54:18 +02:00
Laurent Destailleur
7bfdec7993 Fix: css 2013-06-23 18:53:40 +02:00
Laurent Destailleur
3662638064 Fix: Css for fieldset 2013-06-23 14:37:09 +02:00
Laurent Destailleur
e5eb5492e9 Fix: W3C 2013-06-23 13:03:06 +02:00
Laurent Destailleur
fc62f6f7d6 Fix: Search filter was lost 2013-06-23 13:00:02 +02:00
Laurent Destailleur
f2c268f72c Fix: Missing theme for autofill 2013-06-23 12:43:06 +02:00
Laurent Destailleur
253ce19bc1 Fix: Bad position of field 2013-06-21 15:26:46 +02:00
Laurent Destailleur
7e748f26a6 Fix: all forms must react same way with option optimize_small_screen 2013-06-20 16:39:17 +02:00
Laurent Destailleur
a1f9b22210 Fix: Missing icon 2013-06-20 16:21:54 +02:00
Laurent Destailleur
a749e2bfaa Fix: Still working on css debug. bureau2crea and cameleo are too 
bugged. I disable them with jmobile to have things working correctly.

Conflicts:
	htdocs/theme/bureau2crea/style.css.php
 2013-06-20 16:20:31 +02:00
Laurent Destailleur
4268ca0de2 Missing space 2013-06-20 09:40:02 +02:00
Laurent Destailleur
66d02240f5 Fix: Missing translation 2013-06-20 09:36:36 +02:00
Laurent Destailleur
f987fd2245 Fix: Inconsistency arrays into php function 2013-06-19 23:46:46 +02:00
Laurent Destailleur
ec2e4c8a8b Fix: parenthesis at wrong place 2013-06-19 22:58:35 +02:00
Laurent Destailleur
c0b4ff3616 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-19 19:54:00 +02:00
Laurent Destailleur
aaad4d3474 Fix: Menu cheque depends on bank module and not invoice. 2013-06-19 19:52:20 +02:00
Laurent Destailleur
9f39671886 Fix: Bad translation 2013-06-19 19:40:19 +02:00
Laurent Destailleur
ad49f965d5 Merge pull request #1060 from FHenry/3.3 
Fix trad holidays module
 2013-06-19 09:34:10 -07:00
Laurent Destailleur
d6d7665e65 Merge pull request #1059 from marcosgdf/translations 
Fixed es_ES translation typo
 2013-06-19 09:34:03 -07:00
Laurent Destailleur
6779724dc0 Merge pull request #1055 from FHenry/3.4 
Fix ODT to PDF exec scripts path
 2013-06-19 09:30:11 -07:00
Laurent Destailleur
09317e2034 Fix: Pb with firstname/lastname and font size 2013-06-19 18:12:05 +02:00
Laurent Destailleur
5cb2ba3909 Several fixes in CSS 
Conflicts:
	htdocs/core/menus/standard/empty.php
 2013-06-19 17:02:09 +02:00
Laurent Destailleur
e92e6f7131 Fix: Icon of wrong version 2013-06-19 17:00:11 +02:00
Laurent Destailleur
9bd41e94b5 Fix: Pb in css 2013-06-19 17:00:01 +02:00
Florian Henry
035edc12ce Fix [ bug #945 ] error adding a service 2013-06-19 14:41:18 +02:00
Laurent Destailleur
d32b36ce29 Fix: css with jmobile 2013-06-19 14:04:25 +02:00
Florian Henry
835b8e9d7e Fix trad holidays 2013-06-19 11:23:43 +02:00
Florian Henry
ee1e266774 Fix trad holidays module 2013-06-19 11:22:53 +02:00
Marcos García
76d9ba6a43 Fixed es_ES translation typo 2013-06-19 10:24:24 +02:00
Marcos García
676191c1f9 Fix: [ bug #947 ] Can't create proposal lines with unit price = 0 2013-06-19 10:22:46 +02:00
Florian Henry
08e0e8244a Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-19 10:07:32 +02:00
Laurent Destailleur
965b173451 Fix: hooks for leftmenu must not be loaded if left menu hidden, also 
hooks were lost into page search_page.
 2013-06-19 00:12:35 +02:00
Laurent Destailleur
f0aac521d0 Fix: civility label 2013-06-18 23:28:55 +02:00
Laurent Destailleur
8f60d60e8d Fix: Bad return url 2013-06-18 22:12:49 +02:00
Laurent Destailleur
c45cd3aa1c Fix: Tab must not always be visible 2013-06-18 21:44:18 +02:00
Florian Henry
cac7cbebd4 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-18 09:46:49 +02:00
Florian Henry
dc5db0c137 fix ODT to PDF script path 2013-06-18 09:07:53 +02:00
Laurent Destailleur
e8e710fd0c Fix: Translation 2013-06-17 23:53:03 +02:00
Laurent Destailleur
562fa43d9d Fix: Message is not clear enough. 
Fix: Var was not initialized.
 2013-06-17 23:24:53 +02:00
Florian Henry
83116b5627 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-17 16:23:54 +02:00
Laurent Destailleur
8b73b2b4f3 Fix: Solve some problem of redirect when logout 
Conflicts:
	htdocs/user/logout.php
 2013-06-17 14:54:44 +02:00
Florian Henry
7cc7e8392d Fix ODT to PDF exec scripts path 2013-06-17 11:58:59 +02:00
Laurent Destailleur
91068a4476 Fix: Pb into form output 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-06-16 20:16:05 +02:00
Laurent Destailleur
8410ad1933 Fix: CSS 2013-06-16 12:03:27 +02:00
Laurent Destailleur
706b0d562f Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-15 01:09:08 +02:00
Laurent Destailleur
0a9cf26a32 Fix: Bad closing of div 2013-06-14 19:51:53 +02:00
Laurent Destailleur
2f386b1b36 Fix: Bad closing of div 2013-06-14 19:43:45 +02:00
Laurent Destailleur
3b88142ba8 Fix: Import of extra field for members 2013-06-14 02:41:08 +02:00
Laurent Destailleur
13b3a3c850 Fix: Export of extra field for members 2013-06-14 02:35:30 +02:00
Laurent Destailleur
a9edbf4f24 Fix: Bad size of image 2013-06-14 02:25:44 +02:00
Laurent Destailleur
8ed5dfeded Fix: Bad styles of html elements 2013-06-14 02:15:43 +02:00
Laurent Destailleur
b3ca9de399 Fix: Update select with list 2013-06-14 02:09:34 +02:00
Laurent Destailleur
c1b21d1480 Fix: Option not working 2013-06-14 01:29:05 +02:00
Laurent Destailleur
396cbcec62 Fix: Do not update twice level 1 
Conflicts:
	htdocs/product/admin/product_tools.php
 2013-06-14 01:23:54 +02:00
Laurent Destailleur
b3e81afae4 Merge pull request #1045 from FHenry/3.4 
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
 2013-06-13 16:05:01 -07:00
Florian Henry
184f1a4b15 revert Jean modif 2013-06-14 00:44:58 +02:00
Laurent Destailleur
5f60a7c88c Fix: Multiprices were not update by mass vat update tool 2013-06-14 00:11:57 +02:00
Laurent Destailleur
d3a500d6c4 Fix: Missing price level for triggers 2013-06-13 23:26:06 +02:00
Laurent Destailleur
8757fc1dba Fix: css pb with jmobile 2013-06-13 21:43:19 +02:00
Florian Henry
2704ba5f36 Fix bug on attach element in element.php (simply not work before...) 2013-06-13 18:11:23 +02:00
Laurent Destailleur
d9f5151c39 Fix: Bad default value for finished property 2013-06-13 15:53:17 +02:00
Florian Henry
eb298e0557 Merge file from Jean Heimberger 2013-06-13 15:24:09 +02:00
Florian Henry
1d8b2fa2c1 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-13 15:08:09 +02:00
Florian Henry
1ecc24216f Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql) 2013-06-13 15:07:50 +02:00
Florian Henry
fb0a99cb55 Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql) 2013-06-13 15:05:19 +02:00
Laurent Destailleur
32244743d2 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-12 22:12:37 +02:00
Laurent Destailleur
977cd8ca4c Fix: filtering was deleting data ! 2013-06-12 22:12:06 +02:00
Laurent Destailleur
c7868e2471 Fix: css 2013-06-12 21:57:09 +02:00
Laurent Destailleur
2483f044c5 Fix: Trans 2013-06-12 16:28:36 +02:00
Laurent Destailleur
4ba24ed8d7 Fix: Missing empty value 2013-06-11 12:58:52 +02:00
Laurent Destailleur
897d1251c8 Fix: Better fix for cleaning vars (i'm tired today) 2013-06-11 12:10:02 +02:00
Laurent Destailleur
40cd45c166 Fix: Better fix for cleaning vars 2013-06-11 12:01:12 +02:00
Laurent Destailleur
5f9f709a70 Fix: vars must be cleaned for next call 2013-06-11 10:21:28 +02:00
Laurent Destailleur
6872b3f0c4 Trans: Add missing entries 2013-06-11 10:06:22 +02:00
Laurent Destailleur
f4fd71d1f9 Fix: Bad position of currency for USD 2013-06-11 02:05:40 +02:00
Laurent Destailleur
50ff8ab52e Update turkish 2013-06-11 01:02:44 +02:00
Laurent Destailleur
b35274bd30 Update to turkish 2013-06-11 00:28:42 +02:00
Laurent Destailleur
1f95c5d59f Revert "Fix: hookmanager code" 
This reverts commit 2bdf900db9.
 2013-06-11 00:08:15 +02:00
Regis Houssin
2bdf900db9 Fix: hookmanager code 
Conflicts:
	htdocs/core/lib/pdf.lib.php

Change-Id: I4dac5a939abdcbe60fcd1bb21465fabde1324089
 2013-06-10 19:51:07 +02:00
Laurent Destailleur
9ce993fada Fix: skin 2013-06-10 19:18:36 +02:00
Laurent Destailleur
88291e423f Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-09 18:24:52 +02:00
Laurent Destailleur
f78240c067 Doxygen 2013-06-09 18:24:30 +02:00
Florian Henry
4f438224d7 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-09 16:56:47 +02:00
Florian Henry
646be9b984 Fix bug on extrafeild type price and double 2013-06-09 16:56:29 +02:00
Laurent Destailleur
050819ce0b Fix: dead code 2013-06-09 16:15:12 +02:00
Laurent Destailleur
9bb539843f Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-09 16:14:19 +02:00
Laurent Destailleur
e85b72e452 Fix: Bad error management 2013-06-09 15:59:51 +02:00
Marcos García
3b28de0a07 Fixed some translation problems 2013-06-08 21:57:57 +02:00
Marcos García
cf6bfcc9c4 Missing translations 2013-06-08 20:31:39 +02:00
Marcos García
a06de736c2 Merge branch '3.4' into translations 2013-06-08 20:29:07 +02:00
Marcos García
17efbd41c7 Improved es_ES translation 2013-06-08 20:18:09 +02:00
Marcos García
000de9530d Fixed wrong translation key and and improved es_ES translations 2013-06-08 20:15:48 +02:00
Marcos García
3cff899b44 Removed debug message and wrong translation key 2013-06-08 20:01:51 +02:00
Marcos García
532c56002d Entities problem with error message in predefined invoice creation 2013-06-08 19:07:13 +02:00
Laurent Destailleur
bd4ca9f1ed Merge remote-tracking branch 'origin/3.3' into 3.4 2013-06-08 16:55:49 +02:00
Laurent Destailleur
49dcc32374 Fix: Param lang forbidden into price function 2013-06-08 16:53:26 +02:00
Laurent Destailleur
b4abe58237 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2013-06-08 16:49:02 +02:00
Laurent Destailleur
0ffb01e347 Fix: Remove duplicate key 2013-06-08 16:35:52 +02:00
Laurent Destailleur
e13974b5f3 Fix: tcpdf bug 2013-06-08 15:29:27 +02:00
Laurent Destailleur
2c71c898eb Fix: param lang not provided to price function 2013-06-08 15:21:47 +02:00
Laurent Destailleur
afbe6c1808 Fix: translation 2013-06-08 14:56:40 +02:00
Laurent Destailleur
3c9fef8eea Fix: choice of percentage was lost 2013-06-08 01:33:16 +02:00
Laurent Destailleur
dd43f7a890 Fix: memory not freed 2013-06-07 19:12:38 +02:00
Laurent Destailleur
a88a3bb877 Look: More neutral css to match with other skins 2013-06-07 16:39:29 +02:00
Laurent Destailleur
a27d71f083 Fix: Miscellaneous fixes into cachdesk module: 
- Missing footer in cashdesk module
- Wrong field label
- Do not use limit list (Freeze when too many product)
 2013-06-07 15:59:47 +02:00
Laurent Destailleur
c78d5aa4a7 Fix: Bad param 'zone' into printCommon 2013-06-07 14:52:25 +02:00
Laurent Destailleur
693f4f3b8b Fix: Pb of offset in numbering. Add also phpunit test to detect and test 
fix.

Conflicts:
	test/phpunit/NumberingModulesTest.php
 2013-06-06 21:25:10 +02:00
Laurent Destailleur
4bc8cbc993 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-06 09:43:02 +02:00
Laurent Destailleur
bf8fd7d34f Fix: CSS 2013-06-06 09:42:39 +02:00
Laurent Destailleur
8bad0fc97d Merge pull request #1024 from csalvador/updateline-bug 
fixed bug when editing a supplier order line
 2013-06-05 15:41:02 -07:00
Laurent Destailleur
56f9d8f50c Fix: missing style 2013-06-05 22:10:43 +02:00
Laurent Destailleur
0b481f285a Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-05 21:56:37 +02:00
Laurent Destailleur
61d5359f23 Fix: Uniformize menu entries 2013-06-05 21:55:51 +02:00
Cédric Salvador
37ef86379f fixed bug when editing a supplier order line 2013-06-05 18:19:50 +02:00
simnandez
097fbaacd0 Fix: Warning missing argument 2 into withdrawals 2013-06-05 15:09:30 +02:00
simnandez
a4841dacda Fix: Warning missing argument 2 into withdrawals 2013-06-05 15:09:13 +02:00
Laurent Destailleur
e4a3929a5c Fix: Minor fixes into style. 2013-06-05 14:23:49 +02:00
Laurent Destailleur
7aa145ae6a Fix: Previous fix was not complete 2013-06-05 11:09:54 +02:00
Laurent Destailleur
650158dd59 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-05 10:51:09 +02:00
Laurent Destailleur
f83ab0de70 Fix: ModelDoc Activation bug 2013-06-05 10:49:12 +02:00
Laurent Destailleur
94d1f23721 Merge pull request #1019 from GPCsolutions/3.3-societefix 
Fixed field name
 2013-06-04 10:19:44 -07:00
Raphaël Doursenaud
880a27f827 Fixed field name 2013-06-04 18:40:46 +02:00
Laurent Destailleur
3cb6e196b6 Fix: [ bug #919 ] SQL error in product/stock/product.php 2013-06-04 00:31:54 +02:00
Laurent Destailleur
b1a280de32 Fix: error message 2013-06-03 23:11:36 +02:00
Laurent Destailleur
22bde298de Fix: First permission must start with 1 2013-06-03 23:06:15 +02:00
Laurent Destailleur
26ac8f9f28 Fix: Missing translation 2013-06-03 22:17:03 +02:00
Laurent Destailleur
12973dbdb4 Look: Minor enhancement 
Fix: Option to fix bug to send email on by default.
 2013-06-03 22:06:28 +02:00
Laurent Destailleur
205335f347 Fix: Readonly mode for email was ok for eldy only. 2013-06-03 20:16:07 +02:00
Laurent Destailleur
e871ea64eb Fix: Regression 2013-06-03 19:52:34 +02:00
Laurent Destailleur
b4c5114ee6 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-03 19:26:01 +02:00
Laurent Destailleur
1ccde6ad04 Fix: syntax error 2013-06-03 19:25:12 +02:00
Laurent Destailleur
1ff175f14e Fix: Bad regex 2013-06-03 12:46:25 +02:00
Laurent Destailleur
4b3413c84c Fix: Loading of boxes from external modules 2013-06-03 12:43:14 +02:00
Laurent Destailleur
6cf1d25529 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
 2013-06-03 11:09:40 +02:00
Laurent Destailleur
4f0758f9b1 Merge pull request #1011 from marcosgdf/minor 
Avoid warnings
 2013-06-02 04:29:23 -07:00
Laurent Destailleur
25e8b39ca8 Merge pull request #1010 from marcosgdf/bug-908 
Fix: [bug #908] Erreur lors de la configuration du module
 2013-06-02 04:17:48 -07:00
Laurent Destailleur
b75893b3de Merge pull request #1013 from marcosgdf/style 
Fixed empty table when few modules are activated in product card view
 2013-06-02 04:07:49 -07:00
Marcos García
c12da33dcd Fixed empty table when few modules are activated in product card view 2013-06-02 00:37:33 +02:00
Laurent Destailleur
c5783215c4 Fix: Var not initialized 
Fix: Pb of duplicate run of javascript with jmobile
 2013-06-01 23:46:36 +02:00
Marcos García
cf1d269f15 Avoid warnings 2013-06-01 16:11:45 +02:00
Marcos García
7b20757449 Fix: [bug #908] Erreur lors de la configuration du module 2013-06-01 15:51:17 +02:00
Marcos García
8ae0939ae5 Fixed bug #903: Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php 2013-06-01 15:39:45 +02:00
Laurent Destailleur
520101bdfb Fix: Missing vat rate 2013-06-01 02:52:25 +02:00
Laurent Destailleur
9b96e38a35 Fix: Update vat rates for canada 
Conflicts:
	htdocs/langs/fr_CA/main.lang
 2013-06-01 02:49:44 +02:00
Laurent Destailleur
0b3a52395d Fix: Missing mayotte 2013-06-01 02:21:39 +02:00
Laurent Destailleur
b3b80701fd Fix: Bug with jmobile 2013-06-01 02:03:19 +02:00
Laurent Destailleur
4b0b6fdd55 Fix: Avoid pb with jmobile 2013-06-01 00:24:13 +02:00
Raphaël Doursenaud
9f1eb0676b Fix install with PostgreSQL 
The language should be lowercase and unquoted
 2013-06-01 00:02:13 +02:00
Laurent Destailleur
743da5a214 Fix: function to get localtax1 or 2 value from vat rate return bad value 
when countries differs.

Conflicts:
	htdocs/langs/fr_CA/main.lang
 2013-05-31 21:33:48 +02:00
Laurent Destailleur
da73a8d84c Fix: syntax error 
Fix: Bad field param
 2013-05-31 16:39:34 +02:00
Laurent Destailleur
a5962a410e Fix: Bad param used 2013-05-31 16:35:32 +02:00
Laurent Destailleur
5254f102ba Fix: Solve duplicate js and solve jmobile problem of cache. 2013-05-31 16:34:02 +02:00
Laurent Destailleur
67a6313487 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-31 08:02:53 +02:00