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

42562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
fffb0f1bde Fix: bad translation key 2014-09-15 20:23:04 +02:00
Laurent Destailleur
19e017a2c1 Merge pull request #1879 from Cubexed/3.6 
-Renamed POST "project" to "projectstart" in fiche.php
 2014-09-14 21:16:51 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
 2014-09-13 19:10:05 +02:00
Laurent Destailleur
09878a3a32 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-09-13 19:05:03 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
Cubexed
8a3bc25029 -Renamed POST "project" to "projectstart" to avoid strange behavior at project start date selector, probably the generic name "project" was interfering with something 2014-09-12 17:21:48 +02:00
Laurent Destailleur
98d7ce94b8 Merge pull request #1873 from GPCsolutions/projectfixes 
Projectfixes
 2014-09-11 17:27:49 +02:00
Laurent Destailleur
dddafacad9 Merge pull request #1871 from KreizIT/3.6 
Little fix
 2014-09-11 17:15:29 +02:00
Laurent Destailleur
7851587a11 Merge pull request #1869 from FHenry/3.6 
Extrafield feature select from table should try to translate multiple column when not needed
 2014-09-11 17:13:28 +02:00
Laurent Destailleur
b728ccb52f Merge pull request #1865 from FHenry/3.5 
Add missing image into amarok theme
 2014-09-11 17:13:06 +02:00
Raphaël Doursenaud
367d225d3e Fixed missing class include for task duplication 2014-09-08 16:13:29 +02:00
Raphaël Doursenaud
c5ccf2998b Fixed forgotten rename 2014-09-08 16:13:03 +02:00
Laurent Destailleur
5a93a7620c Upgrade tcpdf to 6.0.093 to get fixes and solve a problem of licence. 2014-09-07 11:00:54 +02:00
Cedric
f62e7d6043 Little fix 2014-09-07 10:07:26 +02:00
Laurent Destailleur
996977a4a8 Fix: Missing user name 2014-09-06 17:10:52 +02:00
Laurent Destailleur
6d9cc15856 Fix: Function unaccent was not enough complete. 2014-09-06 14:40:43 +02:00
Laurent Destailleur
31eb4bda88 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/compta/facture.php
 2014-09-06 00:26:11 +02:00
Laurent Destailleur
522b5a91bc Fix: Filter on direction of payment mode was not working. 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/fiche.php
 2014-09-06 00:21:09 +02:00
Laurent Destailleur
2b9b110f9c Fix: Filter on direction of payment mode was not working. 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/fiche.php
 2014-09-06 00:16:24 +02:00
Juanjo Menent
104df1d16d Merge pull request #1866 from aspangaro/3.6 
Payment VAT & Salaries :: Add controls on field required
 2014-09-05 22:30:03 +02:00
aspangaro
f054d624cd Merge branch 'Upstream/3.6' 2014-09-05 20:59:44 +02:00
aspangaro
71832b5944 Changelog 2014-09-05 20:55:40 +02:00
Laurent Destailleur
0e944b0403 Fix: Pb with week position when week start on sunday. 2014-09-05 15:00:53 +02:00
Laurent Destailleur
e4bff59f1a Fix: pgsql compatibility. No upper cas into field names. 2014-09-04 20:17:25 +02:00
Laurent Destailleur
643fc6c61f Fix: Bad use of fetch_lines 
Conflicts:
	htdocs/comm/propal.php
	htdocs/contrat/fiche.php
	htdocs/opensurvey/class/opensurveysondage.class.php
 2014-09-04 19:03:48 +02:00
Laurent Destailleur
cd00ec29bf Fix: Dictionnary with one n 
Conflicts:
	htdocs/expedition/fiche.php
 2014-09-04 19:00:28 +02:00
Florian HENRY
85cabbf921 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2014-09-04 18:29:17 +02:00
Laurent Destailleur
da8a1cb475 Fix: Iban was used instead of Bic into SEPA file. 
Fix: Must unaccent strings into SEPA file.
 2014-09-04 15:38:20 +02:00
Laurent Destailleur
b88b4fbc2c Fix: bad balance of td 2014-09-04 15:17:15 +02:00
Laurent Destailleur
395209a5db Fix: Reason to have button greyed is wrong 
Conflicts:
	htdocs/compta/facture/prelevement.php
 2014-09-04 15:17:05 +02:00
aspangaro
4e05afdd66 Payment Salaries :: Add field required & control on it 2014-09-03 21:32:31 +02:00
aspangaro
bd99f3943d Payment VAT :: Add control on field required 2014-09-03 21:31:40 +02:00
Florian HENRY
b04eae95e5 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-09-03 11:44:37 +02:00
Florian HENRY
b536c8a10c Add missing image into amarok theme 2014-09-03 10:24:41 +02:00
Laurent Destailleur
165856656a Fix: balance with td 2014-09-02 19:45:50 +02:00
Laurent Destailleur
f7c48558e6 Fix: balance with td 2014-09-02 19:45:05 +02:00
Laurent Destailleur
80968bc087 Merge pull request #1857 from aternatik/resource-fix 
Fixes for resource module
 2014-09-02 19:35:06 +02:00
Laurent Destailleur
257d7c41d6 Merge pull request #1863 from FHenry/3.6 
Fix: list event view lost type event filter
 2014-09-02 19:34:17 +02:00
Laurent Destailleur
660557b4dd Merge pull request #1862 from FHenry/3.5 
Fix: list event view lost type event filter
 2014-09-02 19:34:07 +02:00
Laurent Destailleur
0bc511a626 Merge pull request #1850 from braito4/patch-1 
Update fiche.php
 2014-09-02 19:12:09 +02:00
Laurent Destailleur
576512e339 Merge pull request #1815 from GPCsolutions/catbug 
Fix categories bug
 2014-09-02 19:05:05 +02:00
Laurent Destailleur
17dec4b924 Fix: Bad merge 2014-09-02 13:05:03 +02:00
Laurent Destailleur
e82e26c6fa Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
	htdocs/compta/facture.php
	htdocs/core/js/lib_head.js
 2014-09-02 12:57:33 +02:00
Florian HENRY
9b40cc9e89 fix 2014-09-02 12:09:43 +02:00
Florian HENRY
832d1b37c1 Save also code of event 2014-09-02 11:32:38 +02:00
Florian HENRY
911aca399d save code event 2014-09-02 11:30:35 +02:00
Florian HENRY
0dd955875c Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-09-02 11:21:03 +02:00
Florian HENRY
c8a9f4600c Fix: list event view lost type event filter 2014-09-02 11:20:57 +02:00
Florian HENRY
67b308cb25 Fix: list event view lost type event filter 2014-09-02 11:15:01 +02:00
Juanjo Menent
2d0f353529 Merge pull request #1859 from FHenry/3.6 
Fix SQL syntax
 2014-09-01 22:26:21 +02:00