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

54031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
cff320dbe1 Merge pull request #5289 from tiaris/devcamp2 
FIX  #4173 Ergonomie of product/service card
 2016-06-04 17:32:26 +02:00
Juanjo Menent
5da197c517 Merge pull request #5288 from simnandez/develop 
Fix printing following the rules
 2016-06-04 16:41:22 +02:00
jean
49d0c8d5ff FIX #4173 Ergonomie of product/service card 
Add configuration key PRODUCT_NODISPLAYIFNOPHOTO to avoid displaying
nophoto.png
 2016-06-04 16:34:26 +02:00
Laurent Destailleur
e069d7c23a Merge pull request #5287 from tiaris/devcamp2 
Can not modifiy a non admin user to admin (#5014)
 2016-06-04 16:20:46 +02:00
Juanjo Menent
8f617b196a Fix printing following the rules 2016-06-04 15:51:28 +02:00
jean
918ba71e7f FIX #5014 
if $user is admin and different from $object then nbadmin >=1 is ok when
not in multicompany
 2016-06-04 14:59:43 +02:00
jean
6fffc22466 Merge remote-tracking branch 'origin/develop' into devcamp2 2016-06-04 14:56:11 +02:00
Laurent Destailleur
c59c86e648 Merge branch 'develop' of https://github.com/aschio/dolibarr into 
develop

Conflicts:
	htdocs/fourn/facture/list.php
 2016-06-04 14:55:02 +02:00
Laurent Destailleur
1748da6c56 Merge 2016-06-04 14:51:56 +02:00
Laurent Destailleur
dec1af78c3 Merge pull request #5279 from atm-maxime/fix_dont_delete_order_shipment_link 
Don't delete link between order and shipment
 2016-06-04 14:34:54 +02:00
Laurent Destailleur
1dd9e37b2e Merge pull request #5281 from simnandez/develop 
Fix better perfomance in for
 2016-06-04 14:34:39 +02:00
Laurent Destailleur
054329c319 Merge pull request #5283 from novalore/develop 
en_US lang fixes again
 2016-06-04 14:34:15 +02:00
Laurent Destailleur
674164b71c Add a better explanation on job generation 2016-06-04 14:30:05 +02:00
novalore
d924be8b95 en_US lang fixes again 2016-06-04 14:21:21 +02:00
Laurent Destailleur
22b231e686 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-04 14:11:27 +02:00
Laurent Destailleur
975d9357fa FIX On recurring invoice, when generation is done manually from card, 
counter of number of generation must be +1
 2016-06-04 14:08:57 +02:00
Juanjo Menent
baa6dd84cf Fix better perfomance in for 2016-06-04 13:12:05 +02:00
jean
6873e7afec Revert "#5224 Adding "Copyof" before invoice label to remind user to change it and avoid label to be the label of cloned invoice " 
This reverts commit b3504977b0.
 2016-06-04 12:10:38 +02:00
Maxime Kohlhaas
cc2b2a0baa Don't delete link between order and shipment 2016-06-04 11:52:36 +02:00
jean
0d115e0ed0 Merge remote-tracking branch 'origin/develop' into devcamp2 2016-06-04 11:41:49 +02:00
jean
0f14f5a86f supp 2016-06-04 11:39:05 +02:00
Laurent Destailleur
bfb7923d4c Merge pull request #5268 from atm-ph/fix_multicurrency_conf 
Fix conf useful has been commented
 2016-06-04 11:37:01 +02:00
jean
b3504977b0 #5224 Adding "Copyof" before invoice label to remind user to change it 
and avoid label to be the label of cloned invoice
 2016-06-04 11:34:37 +02:00
jean
3102981b88 maj source 2016-06-04 11:04:04 +02:00
Juanjo Menent
8a9dd14ab7 Merge pull request #5278 from novalore/develop 
other fixes in en_US lang files
 2016-06-04 10:08:02 +02:00
Laurent Destailleur
eb7a4c5ccf FIX Creating a supplier order from proposal order 2016-06-04 02:39:13 +02:00
cla
e1c27216ce FIX #4825 2016-06-04 02:20:11 +02:00
novalore
3ee8f931b4 other fixes in en_US lang files 2016-06-04 02:16:58 +02:00
phf
b000ccf2e2 Fix traduction for multicurrency module 2016-06-04 01:46:10 +02:00
cla
6c126da9a9 FIX #4141 2016-06-04 01:34:04 +02:00
Laurent Destailleur
b57476153f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php
 2016-06-04 01:14:36 +02:00
phf
495ce2463d Fix switch currency on document do not get the associate rate 2016-06-04 01:13:23 +02:00
Laurent Destailleur
085fa6902b Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fourn/ajax/getSupplierPrices.php
 2016-06-04 00:58:16 +02:00
Laurent Destailleur
609cc1dd70 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-06-04 00:53:09 +02:00
Laurent Destailleur
9c3365aefc FIX #5163 2016-06-04 00:52:55 +02:00
phf
e3a5af6ad4 Fix clean multicurrency admin 2016-06-04 00:42:01 +02:00
Laurent Destailleur
b51c4ab57b Merge pull request #5275 from novalore/develop 
Miscellaneous typos and errors in en_US lang files
 2016-06-04 00:20:27 +02:00
Laurent Destailleur
1f65ca1961 Merge pull request #5274 from atm-maxime/fix_import_model_type_size4 
Fix import model not correctly saved #5185
 2016-06-04 00:18:32 +02:00
Laurent Destailleur
6cef3b8a96 Merge pull request #5273 from atm-maxime/fix_import_model_type_size 
Fix import model not correctly saved #5185
 2016-06-04 00:18:23 +02:00
novalore
e2ba9c72a8 French string in main.lang 2016-06-04 00:18:15 +02:00
Laurent Destailleur
5c36aa3802 Merge pull request #5271 from aschio/develop 
FIX #5192
 2016-06-04 00:17:45 +02:00
Maxime Kohlhaas
f2e4fdcce4 Fix import model not correctly saved #5185 2016-06-04 00:16:01 +02:00
novalore
1227ee5eb6 Miscellaneous typos and errors in en_US lang files 2016-06-04 00:14:56 +02:00
Maxime Kohlhaas
8901b99e2d Fix import model not correctly saved #5185 2016-06-04 00:14:08 +02:00
Laurent Destailleur
b47db3e9e1 Merge pull request #5266 from atm-maxime/fix_project_time_spent_access 
Fix access to project task time spent creation #5249
 2016-06-04 00:13:32 +02:00
Laurent Destailleur
b9feae0883 Merge pull request #5270 from atm-maxime/fix_pmp_when_stock_enabled 
Fix pmp when stock enabled
 2016-06-04 00:12:53 +02:00
cla
deb7c407ad FIX #4643 2016-06-04 00:08:13 +02:00
Maxime Kohlhaas
8b0b3b1a9d PMP available only if stock module enabled 2016-06-03 23:49:34 +02:00
cla
18424812db closes #5192. 
I deleted the line and moved last_insert_id() functions 3 lines under
 2016-06-03 23:49:08 +02:00
Laurent Destailleur
d20d88e1af Merge pull request #5265 from atm-ph/fix_3.8_soc.php_with_wrong_id 
Fix #4632
 2016-06-03 23:43:54 +02:00