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

43593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Menent
f426b9dcd2 Minor accountancy updates 2014-09-19 15:04:36 +02:00
Laurent Destailleur
ee4d697172 Fix several bugs reported by scrutinizer 2014-09-19 14:57:31 +02:00
Laurent Destailleur
ca3c5d9513 Fix: invalid list of params 
Fix: loading of sql menu
 2014-09-19 14:36:55 +02:00
Laurent Destailleur
7e491c479c Add accountancy language file 2014-09-19 11:24:47 +02:00
Laurent Destailleur
2a9275d0de Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/societe/consumption.php
 2014-09-19 11:09:51 +02:00
Laurent Destailleur
d288b19f4d Merge remote-tracking branch 'origin/3.5' into 3.6 2014-09-19 11:07:15 +02:00
Laurent Destailleur
bc2d8ebabd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-19 11:06:40 +02:00
Laurent Destailleur
f9976bdb6a Qual: Uniformize field names. 2014-09-19 11:03:07 +02:00
Juanjo Menent
e39373ed9a - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 
3.6.0 in supplier invoices when adding a line
 2014-09-19 09:58:58 +02:00
Juanjo Menent
c87e28d5f9 - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 
3.6.0 in supplier invoices when adding a line
 2014-09-19 09:57:35 +02:00
Juanjo Menent
d16a1e587e Trad: Syncro es_ES from transifex 2014-09-19 09:04:45 +02:00
Laurent Destailleur
3a38153889 Typo error 2014-09-18 22:42:43 +02:00
Laurent Destailleur
2b602e7b5a Qual: Uniformize param names. contactidp -> contactid 2014-09-18 18:46:00 +02:00
Laurent Destailleur
f2acb048cc Qual: Uniformize fields name. 2014-09-18 18:02:22 +02:00
Laurent Destailleur
e64e161a58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-18 17:54:24 +02:00
Laurent Destailleur
f1d1be83ac Merge branch 'aspangaro-develop' into develop 2014-09-18 17:53:59 +02:00
Laurent Destailleur
13abff1ed7 Merge branch 'develop' of github.com:aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	ChangeLog
 2014-09-18 17:53:41 +02:00
Laurent Destailleur
2c56b85ab7 Merge pull request #1894 from braito4/patch-3 
Missing date_start, date_end in webserver server_invoice.php
 2014-09-18 17:49:08 +02:00
Laurent Destailleur
2b69358c9c Merge pull request #1896 from FHenry/develop 
Add Dunning into accountancy report
 2014-09-18 17:48:40 +02:00
Laurent Destailleur
fd890c0b81 Merge pull request #1878 from Cubexed/develop 
This commit adds a way to filter projects by checking if selected year is in creation/ending range.
 2014-09-18 17:47:12 +02:00
Laurent Destailleur
46f117b0f9 Merge pull request #1902 from atm-maxime/mko_workonlists 
Work on lists
 2014-09-18 17:29:15 +02:00
Laurent Destailleur
4bda5156e0 Merge pull request #1901 from ndrosis/patch-6 
Correct view greek language
 2014-09-18 17:28:36 +02:00
Laurent Destailleur
ea3d091f03 Merge pull request #1900 from ndrosis/patch-5 
Correct view greek language in PDF
 2014-09-18 17:25:44 +02:00
Laurent Destailleur
6c522f8772 Merge pull request #1898 from GPCsolutions/ciforeveryone 
Fixed typo
 2014-09-18 17:25:18 +02:00
Laurent Destailleur
99f1876aa2 Merge pull request #1903 from aspangaro/develop-accounting 
Patch Accounting Expert module
 2014-09-18 17:24:40 +02:00
Laurent Destailleur
49db9d1304 Fix: Avoid explode when separator : is not. 2014-09-18 17:12:51 +02:00
Laurent Destailleur
65a69d3019 Fix: Bad field 2014-09-18 16:50:16 +02:00
Laurent Destailleur
5a14a44100 Doxygen 2014-09-18 11:13:23 +02:00
Laurent Destailleur
9666d5e3ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
 2014-09-18 10:17:43 +02:00
Juanjo Menent
90edd96646 Fix: Invoices payments may be older than invoices 2014-09-18 10:11:39 +02:00
Laurent Destailleur
b16b1c2ce0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/class/product.class.php
 2014-09-18 10:08:56 +02:00
Laurent Destailleur
015b0d8036 Fix: Bad calculation of total 
Fix: Warning message not translated
 2014-09-18 10:05:37 +02:00
Juanjo Menent
039105a3f1 Fix: Invoices payments may be older than invoices. fr and es trans 2014-09-18 10:02:03 +02:00
Laurent Destailleur
9379e28a94 Perf: Avoid duplicate load of project 2014-09-18 09:59:29 +02:00
Juanjo Menent
ab83e22a12 Fix: Invoices payments may be older than invoices 2014-09-18 09:57:13 +02:00
Laurent Destailleur
736320ba47 Fix: Bad property 2014-09-18 09:36:47 +02:00
Laurent Destailleur
ae3240bad8 Fix: List of status does not match status into class. 2014-09-18 09:24:10 +02:00
Laurent Destailleur
bfb923f54b Fix: Solve conflict of translation key 2014-09-18 08:58:47 +02:00
Laurent Destailleur
dfa071e093 Fix: Are description too large 2014-09-18 01:43:50 +02:00
Laurent Destailleur
fac24889f6 Sync french 2014-09-18 01:19:46 +02:00
Laurent Destailleur
ba67483421 Fix: too much field into list when option FICHINTER_DISABLE_DETAILS is 
on.
 2014-09-18 00:48:53 +02:00
Laurent Destailleur
68ff0aa7c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-18 00:21:43 +02:00
Laurent Destailleur
47d423aae4 Fix: Minor fix into intervention card 2014-09-18 00:21:25 +02:00
Juanjo Menent
b781cf2067 Merge pull request #1892 from GPCsolutions/php56 
PHP 5.6 compatibility
 2014-09-17 18:56:50 +02:00
Maxime Kohlhaas
64fe082539 New generic functions for search pictos, to be used in every lists 2014-09-17 17:59:00 +02:00
Maxime Kohlhaas
f6df17bc01 Add filters on shipment list + delivery informations 2014-09-17 17:58:37 +02:00
Maxime Kohlhaas
3611ac673f Add clear search icon on invoices list 2014-09-17 17:58:11 +02:00
Maxime Kohlhaas
9cc01635aa Add clear search icon on unpaid invoices list 2014-09-17 17:56:53 +02:00
Laurent Destailleur
f0ebd7721d Fix: Restore sort feature. Still did not see why previous commit is a 
bug fix of dolibarr bug.
 2014-09-17 17:49:39 +02:00
Laurent Destailleur
3a11a46101 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-17 17:38:49 +02:00