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

37365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Menent
6b0e521920 Merge pull request #1177 from FHenry/3.4 
Fix update extrafield do not display immediatly
 2013-08-14 00:48:08 -07: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
5fcbd2d14f Fix Bug with canvas 2013-08-12 19:44:30 +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
ba58ab153b Merge remote-tracking branch 'origin/3.3' into 3.4 2013-08-10 01:09:11 +02:00
Laurent Destailleur
e56ef31cfb Merge pull request #1174 from FHenry/3.4 
Fix: Supplier invoice and supplier order are not displayed into object
 2013-08-09 04:15:29 -07: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
04caccc5f3 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-08-05 23:37:13 +02:00
Laurent Destailleur
784c8acaf7 Trans: Upgrade language file 2013-08-05 23:27:13 +02:00
Laurent Destailleur
a7b182c37c Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-08-05 13:09:39 +02:00
Laurent Destailleur
b01fd7b739 Fix: Permission into git repo are wrong for some files. 2013-08-05 12:54:34 +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
e9df22dcc0 Fix: restore lost info into changelog. 
Add note of todo for next versions.
 2013-08-01 04:28:12 +02:00
Laurent Destailleur
f765288f12 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
 2013-07-31 12:38:15 +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
Laurent Destailleur
22447cd0b7 Merge pull request #1142 from FHenry/3.4 
update no_email column on unsubcribe link for contact
 2013-07-30 06:40:31 -07:00
Florian Henry
4d3738410e update no_email column on unsubcribe link for contact 2013-07-30 15:18:19 +02:00
Laurent Destailleur
72e0b7579e Merge pull request #1141 from FHenry/3.4 
Fix extrafield thirdparty import and export
 2013-07-30 05:38:29 -07: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
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
a43e7fd34e Fix: Changelog 2013-07-27 12:39:01 +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