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

43579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
aspangaro
9da597d56e Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-18 20:18:56 +02:00
aspangaro
7a9ce455d9 Uniformize code $_SERVER["PHP_SELF"] 2014-09-18 20:13:38 +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
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
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
Laurent Destailleur
12ae552486 Fix: Option to make pg_dump/restore 2014-09-17 17:38:07 +02:00
Raphaël Doursenaud
c15849df2d Fixed typo 2014-09-17 16:40:35 +02:00
Regis Houssin
099daf4296 Fix: remove hook restriction ! 2014-09-17 16:08:58 +02:00
Regis Houssin
f185028707 Fix: remove hook restriction ! 2014-09-17 16:08:14 +02:00
Regis Houssin
c6b5d0f96c Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-09-17 16:07:21 +02:00
Regis Houssin
d225d92c0b Fix: remove hook restriction ! 2014-09-17 16:03:21 +02:00
Cubexed
fe9e7a0fa9 Revert "Closed projects are greyed out in project selector" 
This reverts commit 68994823dd.
 2014-09-17 15:41:46 +02:00
Laurent Destailleur
900cdd5368 Qual: Removed duplicate page. 2014-09-17 15:24:01 +02:00
Laurent Destailleur
d976a5575b New: Add option MAIN_GENERATE_INVOICES_WITH_PICTURE to show picture onto 
PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals.
 2014-09-17 14:36:04 +02:00
Laurent Destailleur
9c54dc57df Save some usefull cleaning requests into repair.sql 2014-09-17 12:31:35 +02:00
Laurent Destailleur
6eb3fe1ae4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-17 01:13:20 +02:00