Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,072 Commits 36 Branches 189 Tags
048e270fecb35b6b27f51bfb0d151a48aa69935f
Commit Graph

2208 Commits

Author SHA1 Message Date
Laurent Destailleur
953f638cb4 New: Sort combo list for type of thirdparties. 2013-10-28 02:13:07 +01:00
Laurent Destailleur
c81bb60384 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/public/cron/cron_run_jobs.php
 2013-10-27 02:33:03 +02:00
Laurent Destailleur
197ae822d4 Merge pull request #1263 from FHenry/develop 
Fix list propal and invoice to display customer ref if option is set
 2013-10-26 17:13:07 -07:00
Laurent Destailleur
f67537799b Fix: Wrong usage of new preoutput confirm box 2013-10-26 18:46:07 +02:00
Florian Henry
c2def3d0b6 Fix bad display IE for checkbox extrafield readonly 2013-10-25 10:01:41 +02:00
Florian Henry
9804527216 Fix bug in option display account number in list 2013-10-23 11:25:42 +02:00
Laurent Destailleur
14717e6279 Comment 2013-10-22 00:30:55 +02:00
BENKE Charles
15b1507c84 Update html.formfile.class.php 
Add subfolders feature in GED managment
 2013-10-20 20:58:38 +02:00
Laurent Destailleur
0d36329336 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-10-14 15:56:42 +02:00
Regis Houssin
8daef9d99f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-10-12 11:58:57 +02:00
Regis Houssin
bc0f65b73c Fix: reorder lines problem 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2013-10-12 11:58:38 +02:00
Regis Houssin
8801d7a1eb Fix: reorder lines problem 2013-10-12 11:54:37 +02:00
Laurent Destailleur
559b75c49b New: Add hidden option MAIN_FORCE_DEFAULT_STATE_ID. 2013-10-11 12:14:14 +02:00
Laurent Destailleur
b0e38f7619 Fix: Manage strange language code reported bu chrome browsers. 2013-10-11 10:01:47 +02:00
Maxime Kohlhaas
845deb9a63 Add multilang management in ODT models 2013-10-08 09:17:04 +02:00
Christophe Battarel
02278a399c better margin calculation (especially for credit notes) 2013-10-05 10:29:22 +02:00
Laurent Destailleur
019c86dff0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2013-09-28 13:26:52 +02:00
Laurent Destailleur
4cf84c4ea8 New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS 2013-09-28 13:24:58 +02:00
Laurent Destailleur
ca24b45aa9 Merge pull request #1101 from PaulPoulain/940-develop 
940 develop
 2013-09-26 05:00:57 -07:00
Laurent Destailleur
c88072433c Merge pull request #1244 from defrance69/patch-12 
Update commonobject.class.php
 2013-09-25 08:18:49 -07:00
BENKE Charles
1c988fc559 Update commonobject.class.php 2013-09-25 11:14:50 +02:00
BENKE Charles
f88470d3b8 Update html.formcompany.class.php 
use paramter to select only active type of contact
 2013-09-25 10:17:27 +02:00
BENKE Charles
b400803a2a Update commonobject.class.php 
add complementary param
 2013-09-25 10:15:32 +02:00
Christophe Battarel
b197231c04 fix bad margin calculation for credit notes 2013-09-24 17:49:56 +02:00
BENKE Charles
d978d64d59 Update commonobject.class.php 
just the active type of contact
 2013-09-24 14:19:52 +02:00
Laurent Destailleur
6b2966794a Do not show free text for thirdparty email send form 2013-09-23 14:35:22 +02:00
Laurent Destailleur
cb04b05e85 New: Can send an email from thirdparty card. 2013-09-23 13:17:31 +02:00
Laurent Destailleur
7ed5d5e543 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-09-23 11:25:06 +02:00
Laurent Destailleur
31d3e419b2 Fix: doxygen 2013-09-23 09:35:16 +02:00
Laurent Destailleur
9a475e9ed2 New: Add method to use a dictionnary as a combo box. 2013-09-22 23:54:01 +02:00
Laurent Destailleur
dd0612099c Qual: Uniformize fields departement_id into state_id 2013-09-20 14:35:58 +02:00
Laurent Destailleur
3d62303d59 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	build/debian/get-orig-source.sh
	build/debian/watch
	htdocs/fourn/ajax/getSupplierPrices.php
 2013-09-19 01:02:53 +02:00
Laurent Destailleur
491bd76c1b Work on openif authentication mode 2013-09-18 21:22:24 +02:00
Laurent Destailleur
8526d34d3b Fix: Calculation of second rounding method is available for supplier 
invoices.
 2013-09-18 16:46:54 +02:00
Maxime Kohlhaas
e3d4a7bc35 Fix : wrong contact list was used for cc and ccc in formmail 2013-09-18 13:36:22 +02:00
Laurent Destailleur
9826b202e9 New: Provide both tags for string formated amount and numeric amount 
into odt templates.
New: [ task #923 ] Localtax support for ODT templates
 2013-09-16 12:42:01 +02:00
Christophe Battarel
775d259f88 Fix: Supplier price displayed on document lines and margin infos didnt take discount 2013-09-15 14:52:41 +02:00
Laurent Destailleur
b20b82df3d Fix: we must use conf-currency as parameter of method price instead of 
using langs->getCurrencySymbol
 2013-09-15 13:04:38 +02:00
Laurent Destailleur
57dee255a2 Normalize code 2013-09-14 14:41:12 +02:00
Laurent Destailleur
4c1faf626e Merge remote-tracking branch 'origin/3.4' into develop 2013-09-14 14:36:17 +02:00
Laurent Destailleur
914e167183 Fix: Bad sql request 2013-09-14 14:34:45 +02:00
BENKE Charles
085a8d68db Update html.formother.class.php 
bugfix
 2013-09-14 10:41:36 +02:00
Laurent Destailleur
f2bdd8c1d8 Work on alternative vat calculation mode 2013-09-13 17:43:26 +02:00
Laurent Destailleur
74f8a19134 Qual: Make code simpler 2013-09-11 15:17:31 +02:00
Raphaël Doursenaud
9636e1aafc Replaced PHP 5.5 deprecated calls 2013-09-11 14:48:02 +02:00
Laurent Destailleur
fd17280521 Removed all checkstyle errors 2013-09-11 09:40:00 +02:00
Laurent Destailleur
f195d59c9c Try to fix false positive with dolgraph 2013-09-10 16:12:20 +02:00
Laurent Destailleur
21602b34a9 Try to fix false positive with dolgraph 2013-09-10 15:56:40 +02:00
Laurent Destailleur
7d2109f8e8 Try to fix false positive with dolgraph 2013-09-10 15:50:05 +02:00
Laurent Destailleur
e467d63a94 Try to fix false positive 2013-09-10 15:45:36 +02:00