Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,052 Commits 36 Branches 189 Tags
abc96b51fa815cd039f340984927e14b768aeead
Commit Graph

1200 Commits

Author SHA1 Message Date
Laurent Destailleur
abc96b51fa Enable extrafields for customer order, proposal and invoice lines. This 
feature was developed for 3.5 but was disabled (hidden) because of
a bug not possible to fix enough quickly for 3.5.0 release.
 2014-02-16 23:51:29 +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
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
40a53d4b57 Fix: used bad constant name 2014-01-31 16:06:28 +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
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
ee41273286 Fix: Count of files were wrong 2014-01-26 19:27:42 +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
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
Florian Henry
a7c892e23b Fix Mask numbering 2014-01-21 14:18:00 +01: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
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
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
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00
Laurent Destailleur
79e4c283db Fix: Deletion of files was broken 2014-01-19 22:43:36 +01:00
Laurent Destailleur
becd65f9d3 Fix: Bad space into log 2014-01-19 21:34:48 +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
Raphaël Doursenaud
78b40eaa8c Handle default session path nicely 2014-01-11 17:30:29 +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
4d379e572a Fix: Bugs into permissions for module category 2014-01-07 15:35:26 +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
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
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
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
e142bd252d Fix: disable code making jmobile crazy. 2013-12-31 10:48:15 +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
Laurent Destailleur
37b0780523 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/ecm/tpl/builddatabase.tpl.php
	htdocs/fourn/commande/liste.php
	htdocs/product/admin/product_tools.php
 2013-12-08 00:42:36 +01:00
Laurent Destailleur
598a241366 Fix: minor css. 
Fix: Alignement of screenshot was wrong. Wrapping too.
 2013-12-06 10:23:26 +01:00
Laurent Destailleur
24ce511671 Fix: [ bug #1167 ] Supplier IBAN account number set but no account 
specified warning
 2013-12-04 18:20:58 +01:00
Florian Henry
c2a8967b52 Much better fix for translated product description into PDF 2013-12-03 17:06:19 +01:00
Florian Henry
3e712c9c8c Finnaly make it works 2013-12-02 11:11:08 +01:00
Florian Henry
0907d81fcb Avoid strpos bug if string is empty or null 2013-12-02 11:05:07 +01:00
Florian Henry
1ad1b25f6e remove useless space 2013-12-02 10:29:58 +01:00
Florian Henry
1b38d36f28 Better Fix 2013-12-02 10:27:41 +01:00
Florian Henry
c0ef63fd74 Bteer fix 2013-12-02 00:22:49 +01:00
Florian Henry
ff9c84fd0e Better test for HTMLentities desc translation 2013-12-02 00:20:50 +01:00
Florian Henry
c6991f97d4 [ bug #1174 ] Product translated description not good into PDF 
Country
 2013-12-01 22:47:22 +01:00
Laurent Destailleur
d0b05bb5af Fix: Restore style code lost by a commit. 2013-11-28 18:55:36 +01:00
Laurent Destailleur
bdf8100d84 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/product/stats/commande_fournisseur.php
 2013-11-28 15:54:12 +01:00
Laurent Destailleur
88ae0a7945 Fix: the rename function is bugged with some windows. I add a 
workaround.
Fix: Add also a workaround for [ bug 1064 ] Date/Time in ICS incorrect.
 2013-11-28 12:58:02 +01:00
Florian Henry
8f9143cef7 revert param_ihm 2013-11-24 18:07:40 +01:00
Laurent Destailleur
aa3c16b6af Fix: chars were lost by function 2013-11-23 16:34:08 +01:00