Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
41,707 Commits 36 Branches 190 Tags
c04812cd15d2bc7c66bfd1bef8a6c0866f28ba0c
Commit Graph

41707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-François Ferry
c04812cd15 Fix: bad lang file 2014-05-10 22:06:22 +02:00
Jean-François Ferry
1ad3405ee8 Qual : codesniffer 2014-05-10 22:06:22 +02:00
Jean-François Ferry
a2bfcfae31 Qual : codesniffer 2014-05-10 22:06:22 +02:00
Jean-François Ferry
6c75a0cb11 Add database tables for resource module 2014-05-10 22:06:22 +02:00
Jean-François Ferry
9e542397ef Missing lang key 2014-05-10 22:06:22 +02:00
Jean-François Ferry
fdb50ab116 Move generic function from commonobject.class to functions2.lib.php (work on resource module) 2014-05-10 22:06:22 +02:00
Jean-François Ferry
e76ce87547 Remove unused css 2014-05-10 22:03:05 +02:00
Jean-François Ferry
6e24004e82 Remove resource module config page 2014-05-10 22:03:05 +02:00
Jean-François Ferry
bb58bed930 In commonoobject add method for adding resource to an element 2014-05-10 22:03:05 +02:00
Jean-François Ferry
e63f8b87c1 Mark resource module as experimental / need Dolibarr 3.5 2014-05-10 22:03:05 +02:00
Jean-François Ferry
71c44d82ab Move resource module functions into commonobject : 
- new method to get an array with object properties
- new method to fetch an object only with id and element_type
 2014-05-10 22:03:05 +02:00
Jean-François Ferry
d9c567ca3d Prepare structure for upstream merge 2014-05-10 22:03:05 +02:00
Jean-François Ferry
98491ff277 Fix conflict 2014-05-10 22:03:05 +02:00
jfefe
06f17da1e5 Fix for custom directory 2014-05-10 22:03:04 +02:00
Florian Henry
b090a4d223 fix pb 2014-05-10 22:03:04 +02:00
jfefe
9de6368be9 First version of resource module 2014-05-10 22:03:04 +02:00
Laurent Destailleur
3776f7b146 Fix: margin calculation from % when we enter a free product. 2014-05-10 20:10:59 +02:00
Laurent Destailleur
2bac66fd52 Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
Laurent Destailleur
7bb24969d8 Fix: [ bug #1372 ] Margin calculation does not work in proposals 2014-05-10 19:52:24 +02:00
Laurent Destailleur
12055aa44a I did a better fix to have no more dependencies between modules. 2014-05-10 19:04:33 +02:00
Laurent Destailleur
c20a5d7e18 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-10 19:02:55 +02:00
Laurent Destailleur
f95c87f1d6 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to 
work but it does not enable it
 2014-05-10 18:57:04 +02:00
Juanjo Menent
4e53b57313 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to 
work but it does not enable it
 2014-05-10 17:54:13 +02:00
Juanjo Menent
373b16f7be Trad: Update es_ES from transifex 2014-05-10 17:33:23 +02:00
Laurent Destailleur
f36b9effe8 Fix: [ bug #1373 ] Required type of payment input is not visible 2014-05-10 17:22:12 +02:00
Laurent Destailleur
3fd7e18c08 Fix: Bad translation into title of action buttons 2014-05-10 17:00:55 +02:00
Laurent Destailleur
1724fd2f89 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-10 16:44:12 +02:00
Laurent Destailleur
4e41b721fb Fix: Nb of notes and doc not visible onto tasks. 2014-05-10 16:43:47 +02:00
Laurent Destailleur
a5ccc538c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-10 15:52:30 +02:00
Laurent Destailleur
33fe18490a Removed useless translation key 2014-05-10 15:50:32 +02:00
Laurent Destailleur
37850b8f6f Merge pull request #1586 from fappels/develop 
fix: if note not set, insert null iso "null"
 2014-05-10 15:45:34 +02:00
Laurent Destailleur
f855709cf4 Merge pull request #1585 from FHenry/3.5 
"or" into if instead of ||
 2014-05-10 15:44:25 +02:00
Laurent Destailleur
eb32094864 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-10 15:33:45 +02:00
Laurent Destailleur
584ddde5aa Sync transifex 2014-05-10 15:33:34 +02:00
Francis Appels
c17f42b767 fix: if note not set, insert null iso "null" 
when create class was called with note not set, text "null" was inserted
in database, changed to null. Also $note property was missing.
 2014-05-10 14:57:22 +02:00
Juanjo Menent
edd4ddd60a Trad: Update es_ES from transifex 2014-05-10 08:25:59 +02:00
Laurent Destailleur
55f93018a6 Fix: We must never use 'alpha' as second parameter of GETPOST when field 
is a "free text". We can use it only for special field we are sure it
contains only alphabetical caracters and only alphabetical chars.
 2014-05-10 02:21:04 +02:00
Laurent Destailleur
7fb0cfb83b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-10 02:10:33 +02:00
Laurent Destailleur
801d99b947 Update doc 2014-05-10 02:10:13 +02:00
Laurent Destailleur
a627dd9ae8 Fix: Duplicate line when project has no tasks. 2014-05-09 17:14:40 +02:00
Juanjo Menent
a652e2c90a Qual: Use GETPOST instead superglobal variables 2014-05-09 16:36:18 +02:00
Laurent Destailleur
62537cf5a4 Fix: translation 2014-05-09 13:39:10 +02:00
Florian HENRY
2aa2f896c6 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-09 13:28:45 +02:00
Florian HENRY
02e0fac79f "or" into if instead of || 2014-05-09 13:28:29 +02:00
Laurent Destailleur
8bf1fde598 New: Can set page to use for getNomUrl of project. 2014-05-09 13:21:10 +02:00
Laurent Destailleur
c0af0c3b52 Fix: translation 2014-05-08 20:29:16 +02:00
Laurent Destailleur
8985d60c5b Update doc 2014-05-08 20:15:44 +02:00
Laurent Destailleur
d76683a116 New: Add hooks on project card page. 2014-05-08 20:07:16 +02:00
Laurent Destailleur
5923a754d1 New: Add hooks for project card 2014-05-08 20:02:34 +02:00
Laurent Destailleur
1b25fdc323 Fix: Param at wrong place. 
Fix: Add warning if phpunit are runned with external module on.
 2014-05-08 18:09:39 +02:00