Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 16:31:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,329 Commits 36 Branches 190 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

54329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maxime Kohlhaas
7866fb9dae Fix #5153 2016-06-04 19:11:32 +02:00
Laurent Destailleur
7bc9d980dc Merge pull request #5293 from novalore/develop 
correction on banks.lang as mentioned in #5267
 2016-06-04 19:00:04 +02:00
Laurent Destailleur
454d054fdf Merge pull request #5294 from atm-maxime/fix_productprice_multicompany 
FIX #4762 Fix product supplier price modification with multicompany
 2016-06-04 18:51:33 +02:00
Laurent Destailleur
5de8eef08d Merge pull request #5300 from defrance/patch-8 
if socity then company requiered
 2016-06-04 18:47:01 +02:00
Maxime Kohlhaas
c3cf72afcc Merge pull request #5296 from aschio/develop 
FIX #5134
 2016-06-04 18:46:33 +02:00
Maxime Kohlhaas
a142588292 Merge pull request #5298 from pselis/develop 
fix #4467
 2016-06-04 18:44:45 +02:00
cla
b440ad4e7b FIX #5134: fixed action 'edit' top page 2016-06-04 18:44:10 +02:00
BENKE Charlie
a193920ddc if socity then company requiered 2016-06-04 18:40:53 +02:00
Laurent Destailleur
a4411c7fe7 Merge pull request #5299 from atm-maxime/fix_expensereport_rights 
Fix rights check on expense reports
 2016-06-04 18:40:45 +02:00
novalore
c5ed9e723f bills.lang: TIP payment fixed in en_US 2016-06-04 18:39:04 +02:00
Laurent Destailleur
9508de85af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-04 18:37:56 +02:00
Laurent Destailleur
c2e853db41 FIX A non admin user should not be able to set/unset a user as admin 
even if he has right to manage permission
 2016-06-04 18:37:41 +02:00
novalore
d750401eb0 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2016-06-04 18:32:27 +02:00
Maxime Kohlhaas
abe84ef991 Fix rights check on expense reports 2016-06-04 18:32:00 +02:00
Laurent Destailleur
5b43608971 Merge pull request #5295 from defrance/patch-7 
fix : login required not verified on update
 2016-06-04 18:31:53 +02:00
paolo
ff95bb1644 fix #4467 2016-06-04 18:31:31 +02:00
cla
9ac05fa8f2 FIX #5134 2016-06-04 18:17:13 +02:00
BENKE Charlie
af8e0802f8 fix : login required not verified on update 2016-06-04 18:15:52 +02:00
Maxime Kohlhaas
3ef9fe2c40 Fix product supplier price modification with multicompany 2016-06-04 18:10:40 +02:00
Laurent Destailleur
acc8cca84a Merge pull request #5290 from atm-ph/fix_3.7_issue_2777 
Fix #2777
 2016-06-04 18:07:16 +02:00
novalore
5de8b6eee5 correction on banks.lang as mentioned in #5267 2016-06-04 18:04:49 +02:00
Laurent Destailleur
4e0f2d624e Merge pull request #5292 from defrance/patch-6 
fix :  #4853
 2016-06-04 17:59:33 +02:00
BENKE Charlie
d86f89a8fa fix : #4853 
append if not contact type for the element
 2016-06-04 17:55:28 +02:00
Laurent Destailleur
d1727139f0 Merge pull request #5291 from novalore/develop 
Bug fix: missing string in compta.lang
 2016-06-04 17:50:15 +02:00
Laurent Destailleur
7e7d0fbe37 Merge pull request #5284 from atm-ph/fix_develop_issue_2666 
Fix #2666
 2016-06-04 17:39:31 +02:00
novalore
2d907bc727 miscellaneous lang fixes in en_US 2016-06-04 17:34:23 +02:00
novalore
dcd83c403b Fix #4968 2016-06-04 17:34:04 +02:00
Laurent Destailleur
aebc7b1233 Merge pull request #5285 from atm-maxime/fix_menus_dashboard_links 
FIX #3243
 2016-06-04 17:33:25 +02:00
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
phf
a62f5bd5b4 Fix #2777 2016-06-04 17:17:22 +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
Laurent Destailleur
1552e7f41f Merge pull request #5286 from atm-ph/fix_3.7_call_function_not_exists 
Fix call function ldap_connect but not exists
 2016-06-04 14:56:42 +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
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