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

56461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
phf
8ccda16ef3 Fix call function ldap_connect but not exists 2016-06-04 14:50:32 +02:00
Maxime Kohlhaas
bd2fe75d08 Fix menus in dashboard links 2016-06-04 14:45:03 +02:00
Laurent Destailleur
c7aa486d93 Merge pull request #5282 from atm-ph/fix_3.9_miss_value_extrafield_on_builddoc 
Fix builddoc with odt lost value of extrafields as "sellist" on view …
 2016-06-04 14:38:12 +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
phf
b3a36688d1 Fix #2666 2016-06-04 14:31:53 +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
Maxime Kohlhaas
3718121cee Add number of permission in user permission tab 2016-06-04 13:25:56 +02:00
Maxime Kohlhaas
d777fca0b9 Warning messages after module activation and for user with no permission 2016-06-04 13:25:39 +02:00
phf
01b881a0a6 Fix builddoc with odt lost value of extrafields as "sellist" on view card 2016-06-04 13:24:42 +02:00
Juanjo Menent
baa6dd84cf Fix better perfomance in for 2016-06-04 13:12:05 +02:00
Maxime Kohlhaas
857454a28d For each module, no default permission on activation 2016-06-04 12:16:30 +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
Laurent Destailleur
5a105b75ec Merge pull request #5276 from atm-maxime/fix_import_mapping 
FIX #5229
 2016-06-04 11:35:27 +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
Juanjo Menent
43d475aa42 Merge pull request #5272 from simnandez/3.9 
Fix issues with strict mode
 2016-06-04 10:07:01 +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
Laurent Destailleur
c9834117c9 Fix #5156 2016-06-04 02:03:30 +02:00
Laurent Destailleur
32b6766a7d FIX #5195 2016-06-04 01:50:01 +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
Maxime Kohlhaas
a1c7632a50 Fix import mapping #5229 2016-06-04 01:28:51 +02:00
Laurent Destailleur
ff6daebee6 FIX #5203 2016-06-04 01:19:27 +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