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

32321 Commits

Author SHA1 Message Date
Laurent Destailleur
afe58abdcd Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 
Conflicts:
	ChangeLog
 2013-09-08 21:51:37 +02:00
Christophe Battarel
9fa37fc5f1 Fix: Edit propal line was losing product supplier price id 
Conflicts:
	ChangeLog
 2013-09-08 21:51:08 +02:00
Laurent Destailleur
2d354de549 Merge pull request #1211 from FHenry/3.4 
Fix: Delete linked element to supplier invoice when deleted (as done for
 2013-09-06 13:49:27 -07:00
Laurent Destailleur
651596e8d5 Fix: missing ; 2013-09-06 13:42:14 +02:00
Laurent Destailleur
f45be6a2a7 Prepare for 3.4.1 
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	build/debian/changelog
 2013-09-06 01:37:07 +02:00
Florian Henry
2740cc78b6 Add dol_syslog 
Fix bug on expedition create : create expedition with rowid (or
origin_id) that already exits, and you will have all product of the
other expedition and the new expedition form order
Revert previous commit filter sort on fourn/facture/index.php
 2013-09-05 17:45:30 +02:00
Florian Henry
95ff16f145 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-09-05 17:39:49 +02:00
Laurent Destailleur
e40d644085 Fix: Remove warning 2013-09-04 16:49:20 +02:00
Laurent Destailleur
af22d38681 Fix: Bad total without tax 2013-09-04 15:07:35 +02:00
Laurent Destailleur
b1c25d91cd Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-09-04 10:45:35 +02:00
Laurent Destailleur
ee0f44c9e3 Fix: Try a fix of cloning lines->array 2013-09-04 10:45:15 +02:00
aspangaro
91320ef99c Update translation fr_FR 2013-09-04 05:17:33 +02:00
Florian Henry
ddeca06f32 Real ref filter 2013-09-03 21:13:05 +02:00
Florian Henry
cb86cd403c Fix: Delete linked element to supplier invoice when deleted (as done for 
all other object into dolibarr)
 2013-09-03 20:01:10 +02:00
simnandez
83042459a5 Fix: compatiblity with multicompany module 2013-09-02 10:07:44 +02:00
Laurent Destailleur
b95aa1ac7b Fix: select list on external table 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-09-02 00:41:14 +02:00
simnandez
b86e20f0e6 Fix: Intervention box links to contracts id 2013-08-29 12:05:29 +02:00
simnandez
fa4a9c73c4 Fix: Localtaxes balance not showing 2013-08-29 09:58:07 +02:00
Laurent Destailleur
e741ce9ea2 Merge pull request #1201 from FHenry/3.4 
Fix: Mailing module : if an email is already in destinaires list all
 2013-08-28 07:41:01 -07:00
Florian Henry
cc90c92cc0 Fix: Mailing module : if an email is already in destinaires list all 
other email from selector was not inserted
 2013-08-28 16:33:21 +02:00
Laurent Destailleur
cfa7b6ead9 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-08-28 13:13:22 +02:00
Laurent Destailleur
b39046ca7e Fix: Add missing syslog 2013-08-28 13:05:14 +02:00
simnandez
dfd14f4430 Fix: [ bug #1043 ] Bad interventions ref numbering 2013-08-27 09:44:00 +02:00
Laurent Destailleur
9cf2d8c556 Merge pull request #1199 from GPCsolutions/3.4-fixmissingparameter 
Update parameter as expected by the function name
 2013-08-26 14:12:30 -07:00
Raphaël Doursenaud
dcc87263d0 Update parameter as expected by the function name 2013-08-26 18:26:11 +02:00
Florian Henry
2dce07590c Fix: If only service module is activated, it's impossible to delete 
service
 2013-08-26 14:39:35 +02:00
Laurent Destailleur
cafd75ac4a Revert a bad fix. 2013-08-24 21:55:02 +02:00
Laurent Destailleur
1c08cad6b9 Fix: Bad translation (to pick to 3.4) 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
 2013-08-24 21:41:36 +02:00
Laurent Destailleur
1c527b8db9 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-08-24 20:59:02 +02:00
simnandez
c242d66530 Fix: [ bug #1039 ] Pre-defined invoices conversion 2013-08-23 18:03:16 +02:00
Christophe Battarel
edf7af444c fix margin reports bugs (wrong group by + jquery syntax error) 2013-08-23 09:10:15 +02:00
Christophe Battarel
ecdce9ddf6 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr into 3.4 2013-08-23 09:07:10 +02:00
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