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

35131 Commits

Author SHA1 Message Date
Marcos García de La Fuente
0a603777ae Added missing spacing 2014-03-11 11:27:06 +01:00
Marcos García de La Fuente
371f0cbb8e Fixed module name in contract admin setup page 2014-03-11 11:15:35 +01:00
Marcos García de La Fuente
096a446b7f Changed style of contract creation form to the 3.5 style 2014-03-11 11:15:15 +01:00
aspangaro
99b2dfda77 Correct Travis Error 2014-03-11 10:52:49 +01:00
aspangaro
d97f9e50cd Merge branch 'upstream/develop' 2014-03-11 10:40:22 +01:00
Laurent Destailleur
6860ae84b9 Avoid browser to hang by adding PROJECT_MAX_NB_TASKS. 2014-03-11 09:48:45 +01:00
Laurent Destailleur
932b421d1d Merge remote-tracking branch 'origin/3.5' into develop 2014-03-11 09:46:51 +01:00
Laurent Destailleur
c9edced656 - New: Add filter on project status into task list. By default, only 
"opened" project are visible.
- New: Status "validated" for project are renamed into "opened".
 2014-03-11 09:43:26 +01:00
aspangaro
12ffb19cec Use more explicit name for class and functions 2014-03-11 06:26:18 +01:00
Laurent Destailleur
67de6699d6 Fix: Translation of number for pt_PT 2014-03-11 01:37:37 +01:00
Marcos García de La Fuente
20262a0164 Fix bug #1295: Error when creating an agenda extrafield with a number as reference 2014-03-10 23:58:16 +01:00
Laurent Destailleur
be97066a74 Fix: Bug into sql request because of incomplete group by 2014-03-10 23:57:19 +01:00
aspangaro
61a5735300 Rename "Sal" class into "Salaries" 2014-03-10 21:17:03 +01:00
Marcos García de La Fuente
fa56fe4e8b Corrected Unknown error message typo 2014-03-10 19:36:32 +01:00
Laurent Destailleur
ccc40362e7 Fix: Must use div for columns of index pages. Not table. 2014-03-10 17:19:02 +01:00
Laurent Destailleur
21bf279248 Fix: css 2014-03-10 16:17:55 +01:00
Gauthier
92e8f54e9a error on ajax_constantonoff function 2014-03-10 10:53:20 +01:00
Laurent Destailleur
97677f08a9 Fix: Add protection to avoid memory hung 2014-03-10 01:49:44 +01:00
Laurent Léonard
353390c971 Fix JavaScript date format in portuguese (Brazil) language file 2014-03-09 23:37:13 +01:00
Laurent Destailleur
4fe4d0fcbc Fix: Translation source 2014-03-09 03:14:53 +01:00
Laurent Destailleur
fad9ba6130 Merge remote-tracking branch 'origin/3.5' into develop 2014-03-09 02:49:39 +01:00
Laurent Destailleur
b2116c37d8 Enhance packager: 
- No need to be root to run script
- create git tag of version
- debian package do not use the deprecated dpatch command
- debian package is a quilt package (not native)
- debian package was missing file watch
- clean exclusion for zip and tgz package (exclusion must be done into
makepack-dolibarr.pl, not into specific package code)
- can publish files to sourceforge
 2014-03-09 01:37:08 +01:00
Laurent Destailleur
2a853329e5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
	htdocs/product/class/product.class.php
 2014-03-08 14:25:59 +01:00
Laurent Destailleur
c082d7c82e Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/main.inc.php
 2014-03-08 14:17:49 +01:00
Laurent Destailleur
2e2f86b968 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
 2014-03-08 14:14:23 +01:00
Laurent Destailleur
a6bb785b5f Fix: Compatibility with v4 of ckeditor (for debian) 2014-03-08 14:06:01 +01:00
Laurent Destailleur
6a3323d6d1 Fix: Readonly mode does not need to use a specific toolbar with ckeditor 
4.
 2014-03-08 13:46:17 +01:00
Laurent Destailleur
7071e233d3 Fix css for ckeditor 4. 2014-03-08 13:36:42 +01:00
Laurent Destailleur
2c0f1340d5 New: Update ckeditor to version 4 (part 2) 2014-03-08 13:17:20 +01:00
Laurent Destailleur
c65d681d87 New: Update ckeditor to version 4 (part 1) 2014-03-08 12:11:01 +01:00
aspangaro
db0a45d78f Merge branch 'upstream/develop' 2014-03-08 04:54:24 +01:00
KreizIT
18e4703438 Travis fix 2014-03-07 12:21:35 +01:00
Laurent Destailleur
0a2a635755 Fix: td balance. 
Fix: New price was not used when editing a line when margin module was
on.
 2014-03-07 11:58:30 +01:00
KreizIT
f0be1f7c21 Fix: Typo on class name 2014-03-07 11:51:26 +01:00
KreizIT
a0f1a60780 Change on shipment for batch product 2014-03-07 11:35:16 +01:00
Laurent Destailleur
32c81588b0 Fix: doxygen 2014-03-07 10:54:57 +01:00
aspangaro
74d3fdae15 Update langs & fix period for salaries in tax module 2014-03-07 06:42:48 +01:00
aspangaro
fca29f4312 Add table into script migration && key language 2014-03-06 21:29:20 +01:00
aspangaro
048b3c01ce Add salary payment in tax module - Link to user. 
Necessary for future hrm module.
 2014-03-06 21:21:16 +01:00
miicha
74df354315 spelling mistake 
I don't know, where its best to put a comment about wrong translations so I made a PR
 2014-03-06 18:58:46 +01:00
Laurent Destailleur
15aebfb7a3 Merge pull request #1455 from marcosgdf/bug-loadban 
Corrected bug when creating document from ODT template
 2014-03-06 18:38:56 +01:00
Laurent Destailleur
260dfe3844 Merge pull request #1454 from marcosgdf/locale-line-odt-tags 
Locale line ODT tags
 2014-03-06 18:34:33 +01:00
Laurent Destailleur
06b2c646c3 Fix: Add a space after (int) for travis succes ;) 2014-03-06 18:31:02 +01:00
Laurent Destailleur
0283c16a47 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-06 18:27:09 +01:00
Laurent Destailleur
d54dce1dbe Merge pull request #1452 from KreizIT/develop 
Correct multiline comments not manage by dolibarr
 2014-03-06 18:24:27 +01:00
Laurent Destailleur
cd3e56a2d0 Merge pull request #1450 from grandoc/develop 
fix english misspelling
 2014-03-06 18:23:51 +01:00
Laurent Destailleur
1396fb1dbe Merge pull request #1448 from GPCsolutions/tcpdf-monotype 
TCPDF: Replaced missing courier monotype font by provided freemono
 2014-03-06 18:23:22 +01:00
Laurent Destailleur
b762c66c8a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-06 18:04:19 +01:00
Laurent Destailleur
270eaf7aca Qual: Uniformize search date for lists. 2014-03-06 17:02:27 +01:00
Laurent Destailleur
c4c82f84c5 Fix: Typo 2014-03-06 16:41:56 +01:00
Marcos García de La Fuente
ca0eb7919e Corrected call to non-existing function 2014-03-06 09:02:36 +01:00
Marcos García de La Fuente
4433f6e8b7 Missing copyright info 2014-03-06 09:01:44 +01:00
Marcos García de La Fuente
c7566893a3 Corrected array indentation 2014-03-06 08:56:28 +01:00
Marcos García de La Fuente
2c22c7707f Created locale ODT line tags for invoice, shipment and order modules, and corrected the use of line_price_ht, line_price_ttc and line_price_vat tags 2014-03-06 08:55:37 +01:00
Laurent Destailleur
fa098adc78 Fix: infinite loop in function num_public_holiday 2014-03-05 21:29:33 +01:00
Laurent Destailleur
774017672f Fix: Number of day calculation. Add PHPUnit case. 2014-03-05 20:52:27 +01:00
Laurent Destailleur
dd3169e1ed Sync from transifex 2014-03-05 20:47:22 +01:00
Laurent Destailleur
6f60755426 New: Add option MAIN_FAVICON_URL 2014-03-05 17:26:59 +01:00
Laurent Destailleur
8f31af9825 Fix: Translation 2014-03-05 16:42:10 +01:00
Alexis Algoud
d139009ef5 bug on update service with service created in 3.4 2014-03-05 15:29:28 +01:00
Laurent Destailleur
16a074a69b Use better module id number 2014-03-05 12:25:31 +01:00
Laurent Destailleur
e9b9491a35 Clean database. Fix with firefox. 2014-03-05 12:15:47 +01:00
KreizIT
a80ecc8052 Correct multiline comments not manage by dolibarr 
Avoid error in loading data and also loading data which not be to.
 2014-03-05 12:06:01 +01:00
Laurent Destailleur
a3fcb5ac5a Fix: Regression with firefox 2014-03-05 11:52:51 +01:00
Laurent Destailleur
6c536d43e5 Can also sort on username. Uniformize code of index page. 2014-03-05 11:37:32 +01:00
KreizIT
d9ea0e0e8c Travis again (It's susceptible) 2014-03-05 11:30:43 +01:00
KreizIT
feae560aa3 Travis correction. 2014-03-05 11:28:40 +01:00
Laurent Destailleur
e9adec49eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-05 11:22:12 +01:00
Laurent Destailleur
60327e92d1 New: Add filter on text and status into survey list. Can also sorter on 
id, text and date end.
 2014-03-05 11:22:01 +01:00
KreizIT
58f2bf078b -Add batch record management 
-Implements stock increase or decrease with batch number record on product's warehouse tab
 2014-03-05 10:54:07 +01:00
Grand Philippe
e32d31f76d fix english misspelling 2014-03-05 09:58:52 +01:00
philippe
e2b29bb108 fix english misspelling 2014-03-05 09:57:36 +01:00
Laurent Destailleur
cdd2815d45 Merge pull request #1449 from KreizIT/dluo_step2 
Dluo step2
 2014-03-05 00:08:58 +01:00
Laurent Destailleur
0bdf1131df Merge pull request #1447 from zongap/patch-2 
Update index.php from Project folder
 2014-03-05 00:05:28 +01:00
Laurent Destailleur
802ed4e675 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-04 23:56:58 +01:00
Laurent Destailleur
c5e639041e More doc comment 2014-03-04 23:56:35 +01:00
Laurent Destailleur
82018bf752 Merge pull request #1445 from KreizIT/dluo_step1 
Batch number management step 1 : database modification
 2014-03-04 23:41:20 +01:00
Laurent Destailleur
bea6887f9c Merge pull request #1444 from atm-alexis/3.5 
debug planned_workload loosing value on error
 2014-03-04 23:39:51 +01:00
KreizIT
7f275dfbf4 - Add table modification for product (forget in step 1) 
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
 2014-03-04 18:55:55 +01:00
Raphaël Doursenaud
9a1919238f TCPDF: Replaced missing courier monotype font by provided freemono 
The courier font is missing from TCPDF's directory.
This leads to "TCPDF ERROR: Could not include font definition file: courier" being outputed by PHP
when the library attempts to render an element with a monotyped font.
Use freemono instead since it's a better alternative (e.g. supports more glyphs) and is already
shipped with Dolibarr.
 2014-03-04 08:19:59 +01:00
Léo
aeaf4bf5f8 Update index.php from Project folder 
A trailing "quote" sign was causing a problem with the link generation of href in the recap table on dashboard.
 2014-03-04 02:29:18 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
KreizIT
c1f88d99b9 Batch number management step 1 : database modification 2014-03-03 14:11:19 +01:00
Laurent Destailleur
df829177bc Fix: Submit form of graph box was reseting params of others. 2014-03-02 17:45:40 +01:00
Alexis Algoud
9de372d4b1 debug planned_workload loosing value on error 2014-03-02 17:33:51 +01:00
Laurent Destailleur
fd9d0747c8 Fix: Bad description 2014-03-02 16:44:31 +01:00
Laurent Destailleur
d9dc8de4e6 Fix: Badd error message 2014-03-02 15:58:02 +01:00
Laurent Destailleur
748d769140 Fix: [ bug #1280 ] service with not end of date was tagged as expired. 2014-03-02 15:50:26 +01:00
Laurent Destailleur
8bd72cc21f Fix: wrapping into combo 2014-03-01 20:05:08 +01:00
Laurent Destailleur
7d7a72b8f1 More interactive autoselect of fields 2014-03-01 20:02:35 +01:00
Laurent Destailleur
d69cee03d8 More interactive autoselect of fields 2014-03-01 19:45:13 +01:00
Laurent Destailleur
c6fb7996ba Fix: [ bug #1238 ] When creating accompte with a %, free product are 
used for calculation.
 2014-03-01 19:11:13 +01:00
Laurent Destailleur
7db903e671 Fix: special code was lost during update 2014-03-01 16:58:10 +01:00
Laurent Destailleur
998ecc3c15 Optimize code. 2014-03-01 15:59:09 +01:00
Laurent Destailleur
b6cefee45a Fix: [ bug #1240 ] traduction 2014-03-01 15:21:11 +01:00
Laurent Destailleur
0b83f1a670 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-03-01 15:06:25 +01:00
Laurent Destailleur
6f4de6e6d0 Fix: [ bug #520 ] Product statistics and detailed lists are wrong 2014-03-01 15:05:00 +01:00
Laurent Destailleur
dfb4117bb5 Fix: Invalid image link 2014-03-01 14:58:06 +01:00
Laurent Destailleur
16d759b0d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-01 14:55:11 +01:00
Laurent Destailleur
325b9c9688 Qual: Removed dead code 2014-03-01 14:54:11 +01:00