Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-24 05:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,072 Commits 39 Branches 191 Tags
afee39ea68ea5eaad940149d6bf0fad1294de229
Commit Graph

8469 Commits

Author SHA1 Message Date
philippe grand
e22fb3c538 fix : Typo 2015-10-02 12:39:09 +02:00
philippe grand
8a9c9f49d5 fix : Typo 2015-10-02 12:37:13 +02:00
Regis Houssin
8912e111a3 Fix: wrong date format 2015-10-02 11:21:23 +02:00
Juanjo Menent
cfa6938e5e Merge pull request #3637 from hregis/develop_origin 
Fix: sql error, status is an integer
 2015-10-02 11:11:39 +02:00
Regis Houssin
65935c6603 Fix: copy/paste error 2015-10-02 10:46:32 +02:00
Regis Houssin
6f9b0e1053 Fix: sql error, status is an integer 2015-10-02 10:37:08 +02:00
Frédéric FRANCE
6e947add92 Update index.php 2015-10-02 08:58:09 +02:00
Laurent Destailleur
4201e8b032 FIX #3630 - Wrong balance report when module salaries and donation 
disabled
 2015-10-01 14:38:31 +02:00
Laurent Destailleur
b57c156b60 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modContrat.class.php
	htdocs/fichinter/card.php
	htdocs/install/upgrade2.php
 2015-10-01 11:16:35 +02:00
Laurent Destailleur
076f2ed9d1 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/lib/security.lib.php
 2015-10-01 11:10:47 +02:00
Laurent Destailleur
72c31c0fa9 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-10-01 10:48:28 +02:00
Laurent Destailleur
4da8fb901b Add comment 2015-10-01 10:48:09 +02:00
arnaud
0b7305d21a FIX facturestat bad sql when customer view is limited 2015-09-28 16:55:34 +02:00
Laurent Destailleur
3f506552e3 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/theme/md_exp/style.css.php
 2015-09-27 21:29:16 +02:00
Laurent Destailleur
fa9103fc97 FIX Bad title line in project view when using jmobile 2015-09-27 16:50:47 +02:00
Laurent Destailleur
fef8203e65 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-26 12:01:58 +02:00
Laurent Destailleur
a3647bea4e Fix bad information in report 2015-09-26 11:53:36 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Juanjo Menent
4fa1be0e35 Issue #3509: Init works 2015-09-26 10:37:36 +02:00
BENKE Charlie
8dcd6158e3 3.8 bad filtering caused by statut filter #3580 
correction ported on 3.8 too, sorry for the bad step process
 2015-09-26 10:15:42 +02:00
Juanjo Menent
ad1a4c7e15 Merge pull request #3598 from GPCsolutions/formconfirm 
[Qual] Replaced deprecated form_confirm()
 2015-09-26 08:48:16 +02:00
Juanjo Menent
d503dd928b Merge pull request #3597 from GPCsolutions/displaymargin 
[Qual] Replaced deprecated displayMarginInfos()
 2015-09-26 08:47:55 +02:00
Juanjo Menent
6999ad0a4f Merge pull request #3587 from GPCsolutions/fiche_titre 
[Qual] Replaced deprecated function calls.
 2015-09-26 08:39:22 +02:00
Juanjo Menent
93c0adf725 Merge pull request #3583 from GPCsolutions/clone 
[Qual] Replaced deprecated dol_clone by native clone
 2015-09-26 08:33:48 +02:00
Juanjo Menent
7bdb5ec86e Merge pull request #3580 from defrance/patch-80 
fix issue #3579 : bad filtering caused by statut filter
 2015-09-26 08:31:24 +02:00
Raphaël Doursenaud
485c369d55 [Qual] Replaced deprecated form_confirm() 2015-09-24 21:10:35 +02:00
Raphaël Doursenaud
50edf63448 [Qual] Replaced deprecated displayMarginInfos() 2015-09-24 21:05:58 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Raphaël Doursenaud
9f2545b95d [Qual] Replaced deprecated dol_clone by native clone 2015-09-24 17:24:40 +02:00
BENKE Charlie
b821878293 change > 0 by >= 0 as mentionned by raphael 2015-09-24 16:53:44 +02:00
BENKE Charlie
d30d91b165 fix issue #3579 : bad filtering caused by statut filter 2015-09-24 08:42:39 +02:00
aspangaro
918c323f8f Salaries : Add info card / add field datec / rename field user_creat to user_author 2015-09-23 06:37:14 +02:00
aspangaro
74e46b2de3 Salaries : Add label for accessibility 2015-09-23 05:47:49 +02:00
Laurent Destailleur
da6a1d6629 NEW Introduce a method getDefaultCreateValueForField for developers to 
get a default value to use for a form in create mode.
Implement it for public and private notes.
 2015-09-22 13:55:31 +02:00
Laurent Destailleur
0821f18712 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-18 21:50:10 +02:00
Laurent Destailleur
8699776930 Better usability with dolidroid 2015-09-18 16:17:52 +02:00
Laurent Destailleur
e974b07b09 Fix javascript error 2015-09-18 16:05:38 +02:00
Laurent Destailleur
0ef297582b Merge pull request #3511 from marcosgdf/bug-3423 
FIX #3423 Not possible update values of extrafields in Facture
 2015-09-13 19:07:15 +02:00
Juanjo Menent
3db03ed558 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-12 23:45:16 +02:00
Juanjo Menent
1deb77896f Fix #3515 Bug: Creating an invoice from a shipment links to wrong customer order 2015-09-12 23:42:48 +02:00
Laurent Destailleur
b94fb9e1f3 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-12 18:22:10 +02:00
Laurent Destailleur
67b7345e83 Fix the feature to log a cheque as returned. 
Fix duplicate parameter mainmenu and leftmenu into url
 2015-09-12 18:00:19 +02:00
Marcos García de La Fuente
637855485e FIX #3423 Not possible update values of extrafields in Facture 
Close #3423
 2015-09-12 17:28:32 +02:00
Laurent Destailleur
94723a9b83 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/langs/en_US/accountancy.lang
 2015-09-12 15:23:02 +02:00
Laurent Destailleur
36632593c0 Fix SQL injections #3300 2015-09-12 11:36:19 +02:00
Laurent Destailleur
5bc74ad6ea Fix SQL injections #3300 2015-09-12 11:23:44 +02:00
aspangaro
15e50ecdb3 Update work 2015-09-09 21:35:41 +02:00
aspangaro
ae6f547ba5 Merge remote-tracking branch 'Upstream/develop' into develop-62 2015-09-09 20:57:28 +02:00