Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,834 Commits 36 Branches 190 Tags
c16cb15ce30ba644f33f01e32b273677007c8044
Commit Graph

4837 Commits

Author SHA1 Message Date
Laurent Destailleur
60b8582aa9 Fix more then 30 security defects 2016-12-18 01:44:26 +01:00
Laurent Destailleur
c5db333af8 Fix translation of error message when sending email 2016-12-17 14:00:39 +01:00
Gustavo Novaro
7728576f19 var to public 
Improve code style
 2016-12-17 03:49:28 -03:00
Alexis Algoud
f0ea610401 change date value 2016-12-16 17:06:05 +01:00
Alexis Algoud
41ddaf5d9b fix but major bug on date name, as to seach a solution 2016-12-16 16:28:10 +01:00
Alexis Algoud
79867a85d0 fix list issue 2016-12-16 16:09:02 +01:00
Laurent Destailleur
c750ba8b99 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang
 2016-12-16 13:56:55 +01:00
Alexis Algoud
4d375bcf95 debug translate 2016-12-16 11:31:14 +01:00
Alexis Algoud
1596760d21 fix regulate / apply new PMP / add or remove line 2016-12-15 17:02:20 +01:00
phf
cca7967144 Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin 2016-12-15 16:19:54 +01:00
Gustavo Novaro
54b433ff6b Replace attributes var for public 
Improve code style.
 2016-12-15 09:54:45 -03:00
Alexis Algoud
9f6f874655 fix 2016-12-15 12:33:26 +01:00
Laurent Destailleur
8f3ce46c50 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-15 12:12:36 +01:00
Laurent Destailleur
2c4c48ad6f Better fix to add server name into email id. 2016-12-15 12:11:39 +01:00
phf
21a648a052 Fix user right on margin module to write buyprice 2016-12-15 12:01:46 +01:00
Alexis Algoud
81b01cd055 fix 2016-12-15 11:23:13 +01:00
Alexis Algoud
703b8708e3 fix create 2016-12-15 10:39:59 +01:00
Alexis Algoud
a463759ba3 init query builder into db 2016-12-14 16:54:05 +01:00
Alexis Algoud
565bcf2332 debug fetch method 2016-12-14 16:11:37 +01:00
BENKE Charlie
2cebeb72aa FIX navigation field is always ref 2016-12-14 15:04:07 +01:00
Alexis Algoud
a636d27ccb Div 2016-12-14 14:34:12 +01:00
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
Alexis Algoud
efc22a4cd8 include default list conception 2016-12-13 09:49:59 +01:00
Regis Houssin
337509d40f Fix: missing date locale and date rfc 2016-12-13 09:40:08 +01:00
Alexis Algoud
baf1acb4fd debug 2016-12-13 09:17:43 +01:00
Laurent Destailleur
d2d0e66c5c Fix style fo ECM module 2016-12-13 01:19:33 +01:00
Laurent Destailleur
902169cb66 Can sort on position on list of documents 2016-12-13 00:40:12 +01:00
Laurent Destailleur
e1a5a90f0a NEW Uploaded files are indexed into database 2016-12-13 00:15:21 +01:00
Alexis Algoud
dfb9ae234c debug 2016-12-12 19:03:02 +01:00
Alexis Algoud
cdfbed5d08 new listview 2016-12-12 17:36:22 +01:00
Alexis Algoud
a7813c37a1 init inventory integration 2016-12-12 12:36:00 +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
Laurent Destailleur
6c4f15df63 Fix lot of fix in css look to match v5 rules. 2016-12-11 16:11:42 +01:00
aspangaro
b7babb8a48 Problem of traduction 2016-12-11 14:13:48 +01:00
Laurent Destailleur
190f432c23 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-11 11:07:22 +01:00
Laurent Destailleur
4969af8c74 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	ChangeLog
	htdocs/product/card.php
 2016-12-11 11:04:15 +01:00
Laurent Destailleur
9b436ce871 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/product/class/product.class.php
 2016-12-11 02:51:32 +01:00
Maxime Kohlhaas
f7524b93ad Actualize currency on supplier order and invoice 2016-12-11 02:50:21 +01:00
Maxime Kohlhaas
177ec97689 Actualize currency on propal, order and invoice 2016-12-11 01:04:58 +01:00
Maxime Kohlhaas
7c82b18da0 New : allow to actualize currency rate 2016-12-10 22:07:25 +01:00
Maxime Kohlhaas
1f48e0486f Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug 2016-12-10 21:50:31 +01:00
Maxime Kohlhaas
eb8f89119f Dynamic select currency 2016-12-10 16:20:37 +01:00
Laurent Destailleur
50bc65ce77 Add css to help debug 2016-12-10 13:05:38 +01:00
Regis Houssin
239e42faa0 Fix: contract use "total_vat" instead "total_tva" 2016-12-09 13:04:05 +01:00
Laurent Destailleur
d23604701c Fix responsive 2016-12-07 15:00:20 +01:00
Laurent Destailleur
083aef9b90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-07 14:27:07 +01:00
Laurent Destailleur
1583d0e49f Fix linkof mass action for pdf merge 2016-12-07 14:14:03 +01:00