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

57039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ecab7cb70e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/class/product.class.php
 2016-12-14 12:29:41 +01:00
Laurent Destailleur
d2e4888bdd Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-14 12:21:33 +01:00
Laurent Destailleur
e4dd020887 Fix bad concat 2016-12-14 11:23:55 +01:00
Laurent Destailleur
af407a094a FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of 
tracking email.
 2016-12-14 11:20:44 +01:00
Laurent Destailleur
56b3f2c011 FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of 
tracking email.
 2016-12-14 10:36:11 +01:00
Laurent Destailleur
530d3503f5 FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of 
tracking email.
 2016-12-14 10:32:31 +01:00
Laurent Destailleur
9f0528f5f1 Complete work on dol_banner 2016-12-14 00:06:50 +01:00
Laurent Destailleur
43d18cd70c FIX if a supplier price reference is changed after creating an order, we 
can't clone order.
 2016-12-13 13:22:24 +01:00
Laurent Destailleur
c11888bcde Fix responsive 2016-12-13 02:18:14 +01:00
Laurent Destailleur
76195f9e45 Fix translation 2016-12-13 01:58:28 +01:00
Laurent Destailleur
d2d0e66c5c Fix style fo ECM module 2016-12-13 01:19:33 +01:00
Laurent Destailleur
71d2ee3aa9 Fix default of a column 2016-12-12 20:30:21 +01:00
Laurent Destailleur
4ac7460b26 Merge pull request #5826 from atm-maxime/new_modimport_update_option 
NEW modimport update option
 2016-12-12 16:30:51 +01:00
Laurent Destailleur
24914e8e4f Fix css and missing warning 2016-12-12 13:18:32 +01:00
Laurent Destailleur
5187ffcc9a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-12 13:03:37 +01:00
Laurent Destailleur
4e86e59fb3 Fix responsive 2016-12-12 13:02:54 +01:00
Laurent Destailleur
7600a10f2d FIX #6156 2016-12-12 12:33:43 +01:00
Laurent Destailleur
7077b4931c Add dump v5 2016-12-12 11:57:50 +01:00
Laurent Destailleur
5520864970 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-12 10:46:43 +01:00
Laurent Destailleur
9d7db152ef Update doc 2016-12-12 10:46:11 +01:00
Laurent Destailleur
568277433f Merge pull request #6159 from tarrsalah/fix_vat_defaul_localtax 
fix (#6158)default localtax1 and localtax2 values.
 2016-12-12 01:03:31 +01:00
Laurent Destailleur
0c84a0f9af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-11 22:10:34 +01:00
tarrsalah
eb6620f6f6 fix (#6158)default localtax1 and localtax2 values. 2016-12-11 17:56:49 +01:00
Juanjo Menent
9c9aca979b Merge pull request #6154 from atm-maxime/mko_phpunit 
Multicurrency unit test
 2016-12-11 16:26:25 +01:00
Maxime Kohlhaas
04ed2df827 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_modimport_update_option 
# Conflicts:
#	htdocs/imports/import.php
 2016-12-11 16:20:46 +01:00
Laurent Destailleur
6c4f15df63 Fix lot of fix in css look to match v5 rules. 2016-12-11 16:11:42 +01:00
Juanjo Menent
9d1d010413 Merge pull request #6155 from simnandez/develop 
Very best fix
 2016-12-11 15:39:54 +01:00
Juanjo Menent
2af54199da Merge remote-tracking branch 'upstream/develop' into develop 2016-12-11 15:38:09 +01:00
Juanjo Menent
1c71eed703 Very best fix of cancel edit line 2016-12-11 15:37:29 +01:00
Maxime Kohlhaas
add55e8764 new phpunit test for pu calculation from pu_devise 2016-12-11 15:23:55 +01:00
Juanjo Menent
bdf4fb587f Merge pull request #6153 from simnandez/develop 
Best fix of cancel edit line
 2016-12-11 15:23:32 +01:00
Juanjo Menent
7915021495 Best fix of cancel edit line 2016-12-11 15:23:07 +01:00
Juanjo Menent
c62a2fb97e Best fix of cancel edit line 2016-12-11 15:21:06 +01:00
Maxime Kohlhaas
43b402f608 fix phpunit test with new multicurrency return value pu_ht_devise 2016-12-11 15:11:11 +01:00
Juanjo Menent
5233c65aba Merge pull request #6152 from jpfox/develop 
FIX cancelling order line modification returned to list instead of card
 2016-12-11 15:00:37 +01:00
Jean-Pierre Morfin
4a39c79d56 FIX cancelling order line modification returned to list instead of card 2016-12-11 14:32:27 +01:00
Juanjo Menent
5c4ab99a9a Merge pull request #6132 from simnandez/3.9 
Fix #5646 Error editing Sell Price on products/services
 2016-12-11 14:32:00 +01:00
Juanjo Menent
6e30831611 Merge pull request #6149 from simnandez/develop 
Fix Uniformize status alignment
 2016-12-11 14:31:33 +01:00
Juanjo Menent
34cc4b3db5 Merge pull request #6151 from atm-maxime/mko_minor_fix 
Minor fixes
 2016-12-11 14:30:58 +01:00
Juanjo Menent
c74cdaf890 Merge pull request #6150 from aspangaro/5.0-b8 
Problem of traduction
 2016-12-11 14:29:59 +01:00
Maxime Kohlhaas
4296a2802c Wrong menu in tab link on user card 2016-12-11 14:27:10 +01:00
Juanjo Menent
3abbb2a3e5 Fix Uniformize status alignment 2016-12-11 14:19:23 +01:00
aspangaro
b7babb8a48 Problem of traduction 2016-12-11 14:13:48 +01:00
Maxime Kohlhaas
5c6a1bece0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_minor_fix 2016-12-11 14:12:21 +01:00
Maxime Kohlhaas
5ed041c0cd Rights should not be given by default 2016-12-11 14:11:28 +01:00
Juanjo Menent
6503d4db21 Merge pull request #6148 from defrance/patch-60 
print_barre_liste only on top of list
 2016-12-11 14:06:32 +01:00
Juanjo Menent
31fad0a610 Merge pull request #6147 from atm-maxime/mko_multicurrency_debug 
Fix multicurrency - Part 3
 2016-12-11 14:04:39 +01:00
BENKE Charlie
37d734387b print_barre_liste only on top of list 2016-12-11 14:03:48 +01:00
Maxime Kohlhaas
6964f196c8 Fix bank account box 2016-12-11 14:01:04 +01:00
Maxime Kohlhaas
083aa63fb4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug 2016-12-11 13:55:07 +01:00