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

37328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
293f556d21 Merge pull request #1137 from FHenry/3.4 
Defaulted PDF model document with default value (set in admin) for
 2013-07-29 10:14:00 -07: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
83e2f0dc48 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/html.formfile.class.php
	htdocs/filefunc.inc.php
 2013-07-27 12:40:59 +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
7af45ccdf3 update changelog 2013-07-26 12:52:51 +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
Laurent Destailleur
0dc7aa15d9 Merge pull request #1131 from jfefe/3.4 
Missing attribute to indicate required extrafields
 2013-07-26 00:40:51 -07: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
Laurent Destailleur
f32bc24285 Fix: Upgrade of package break install 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
 2013-07-24 13:49:40 +02:00
Laurent Destailleur
e8400afeba Fix: rpm packages 
Conflicts:
	build/rpm/dolibarr_generic.spec
 2013-07-24 13:46:50 +02:00
Laurent Destailleur
f4987a6fa5 Fix: Upgrade of package break install 2013-07-24 13:44:08 +02:00
Florian Henry
f11d477770 Fix bug export contact extrafields 2013-07-24 13:28:02 +02:00
Laurent Destailleur
7ae06c6f45 Fix: rpm packages 2013-07-24 12:15:24 +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
Laurent Destailleur
3245458ff5 Merge pull request #1098 from FHenry/3.4 
Fix adding email into mailing module
 2013-07-17 08:41:44 -07:00
Florian Henry
4fee61beb0 Fix adding email into mailing module 
source_id is already added
 2013-07-16 21:34:24 +02:00