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

3836 Commits

Author SHA1 Message Date
frederic34
ece9f68e0c wip 2015-11-04 20:02:04 +01:00
frederic34
614f9c8e98 wip 2015-11-03 23:26:07 +01:00
frederic34
4a67a94704 wip template edit 2015-11-03 23:11:04 +01:00
frederic34
5c725aceb8 sql 2015-11-03 22:12:03 +01:00
frederic34
d362d889f6 wip 2015-11-03 20:50:01 +01:00
Laurent Destailleur
d5b77bdc5f Fix parameters are set at a better place 2015-11-03 19:51:07 +01:00
Laurent Destailleur
12e11da6b4 Use better field 2015-11-02 21:44:52 +01:00
Laurent Destailleur
cd68ea9d0f Fix: We must use external URL for OAuth. 2015-11-02 21:42:11 +01:00
Laurent Destailleur
1bcda200e3 A module to setup OAuth. OK, but what to do once setup of a client 
id/secret is done ?
 2015-11-02 20:48:27 +01:00
Laurent Destailleur
ffe1284a85 Merge pull request #3840 from frederic34/printgcp 
Printing with Google Cloud Print
 2015-11-02 20:09:13 +01:00
Frédéric FRANCE
e7ced32245 Fix Can't edit DictionaryRevenueStamp 2015-11-02 20:08:33 +01:00
Laurent Destailleur
7b3828b68f Merge pull request #3861 from frederic34/patch-7 
Fix Can't edit DictionaryRevenueStamp
 2015-11-02 20:07:09 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
 2015-11-02 19:31:42 +01:00
Frédéric FRANCE
ccb69d313c Fix Can't edit DictionaryRevenueStamp 2015-11-02 18:18:00 +01:00
frederic34
9149032a03 Merge remote branch 'upstream/develop' into printgcp 
Conflicts:
	htdocs/core/actions_printing.inc.php
 2015-11-02 11:43:34 +01:00
frederic34
0836a84c0e Somme cleaning 2015-10-31 18:06:49 +01:00
Laurent Destailleur
a8d28b5e46 NEW Add a filter field to restrict list of member when doing a LDAP list 
request. Use also this filter into ldap command line script making sync
from ldap to dolibarr.
 2015-10-30 19:23:23 +01:00
frederic34
b6be372c4b Merge remote branch 'upstream/develop' into printgcp 2015-10-30 18:12:34 +01:00
frederic34
1694c690ed Printing with Google Cloud Print 2015-10-30 17:22:06 +01:00
Laurent Destailleur
e01bdebc49 Fix translation 2015-10-30 14:37:19 +01:00
philippe grand
aa6b5bc1ce [Qual] Uniformize code 2015-10-29 13:58:16 +01:00
aspangaro
4e9d06785c Fix #3818 & presentation 2015-10-29 06:47:42 +01:00
philippe grand
d517595f82 [Qual] Uniformize code 2015-10-28 19:28:18 +01:00
Juanjo Menent
0bcb9dde10 Merge pull request #3810 from grandoc/develop 
[Qual] Uniformize code
 2015-10-28 16:11:40 +01:00
Laurent Destailleur
fb28586f32 Better visible of what is possible for stock management 2015-10-27 19:18:22 +01:00
philippe grand
12e7c7b9e4 [Qual] Uniformize code 2015-10-27 13:42:00 +01:00
Laurent Destailleur
7d8fab73e1 Merge pull request #3792 from grandoc/develop 
[Qual] Uniformize code
 2015-10-26 23:03:30 +01:00
Laurent Destailleur
6493438e87 NEW The clicktodial module is now able to provide link "tel:" on phone 
numbers. So it is also possible to use clicktodial with a client
solution like the "xivo" local client.
 2015-10-26 16:20:09 +01:00
Laurent Destailleur
4b2db78c3a Keep deprecated options to show or not forms for blind people. 2015-10-26 12:50:32 +01:00
Laurent Destailleur
d5e42478a9 Removed deprecated options to show or not forms. Such forms does not 
exists anymore.
 2015-10-26 12:37:36 +01:00
Maxime Kohlhaas
4b7c451f3d Option of standalone creditnote is hidden 2015-10-26 09:43:58 +01:00
Maxime Kohlhaas
bd831b1f24 Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote 2015-10-26 09:40:50 +01:00
philippe grand
83420880dd Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-10-25 21:07:36 +01:00
Laurent Destailleur
f6d30d8b9e Fix: W3C no form into table 2015-10-23 14:40:45 +02:00
philippe grand
3767ab437e [Qual] Uniformize code 2015-10-23 12:58:30 +02:00
Laurent Destailleur
8df59134a9 Merge pull request #3705 from aspangaro/develop-hrm 
New : Module HRM
 2015-10-22 19:15:49 +02:00
Laurent Destailleur
cac4a85ccd Merge pull request #3788 from atm-maxime/new_customer_recap 
New customer recap
 2015-10-22 18:02:38 +02:00
Laurent Destailleur
9cce56895c Merge branch 'patch-77' of https://github.com/defrance/dolibarr into 
defrance-patch-77

Conflicts:
	htdocs/core/lib/admin.lib.php
 2015-10-22 13:13:02 +02:00
frederic34
865e9d9738 Merge remote branch 'upstream/develop' into patch-15 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2015-10-22 10:28:06 +02:00
BENKE Charlie
ef79bb3b67 Update dict.php 2015-10-21 05:23:49 +02:00
BENKE Charlie
88ca8d2ace Update dict.php 2015-10-21 05:22:33 +02:00
Laurent Destailleur
9a1ec900bd NEW Add into about page, a sample text to use to promote new version 
release (visible only if version is last stable)
 2015-10-21 00:31:32 +02:00
Frédéric FRANCE
229fa59f6c Update commande.php 2015-10-19 21:57:26 +02:00
Maxime Kohlhaas
a953a66616 New : allow to define list size for object list on customer card 2015-10-19 19:05:04 +02:00
Laurent Destailleur
e43f1cee7b Better error message 2015-10-19 10:52:46 +02:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
aspangaro
aac88519de Merge remote-tracking branch 'Upstream/develop' into develop-hrm 
Conflicts:
	htdocs/user/card.php
 2015-10-17 07:19:46 +02:00
Laurent Destailleur
d27330e012 Removed useless info 2015-10-15 03:38:21 +02:00
Laurent Destailleur
7f75a3da9d NEW On list of thirdparties, user can select fields to show. 
Make phpunit test working again localy.
Add missing columns into llx_expedition.
 2015-10-15 03:29:35 +02:00
aspangaro
8e37da55c3 Add searchform, language key and correct code 2015-10-10 08:34:15 +02:00
Laurent Destailleur
2b17cd3353 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-08 23:50:24 +02:00
Laurent Destailleur
0d799402d0 Work on image for "no photo" with better resolution 2015-10-08 23:50:17 +02:00
philippe grand
0e343ae3b2 syntax error 2015-10-08 09:34:02 +02:00
Laurent Destailleur
4b103ba8ce Work on a better way to manage modules. All one page. Introduce a way to 
choose order of modules family. We should also be able to introduce
filters.
 2015-10-07 08:13:23 +02:00
Laurent Destailleur
85a5b0fc69 Merge pull request #3652 from grandoc/develop 
FIX : typo
 2015-10-04 19:57:12 +02:00
Juanjo Menent
92f4c0d015 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 2015-10-03 16:01:24 +02:00
philippe grand
298fafd7d2 fix : internationalization 2015-10-03 15:10:53 +02:00
philippe grand
b6de2a954c fix : internationalization 2015-10-03 15:04:03 +02:00
Juanjo Menent
67d28d6991 Merge remote-tracking branch 'upstream/develop' into dolibarr-3509 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-10-03 14:59:56 +02:00
philippe grand
82c7022e20 Fix : internationalization 2015-10-03 14:47:11 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
 2015-10-03 14:28:31 +02:00
Laurent Destailleur
5acf961f23 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-03 00:10:19 +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
9c4a12b9d4 Merge pull request #3613 from aspangaro/develop-68 
Fix : remove viewport for mobile device already declared
 2015-10-01 10:29:39 +02:00
Laurent Destailleur
747c49862c Try to solve a flush pb 2015-09-30 19:15:45 +02:00
Florian HENRY
e209fb23a2 FIX : Admin fiche inter page do not take good action 2015-09-29 18:27:39 +02:00
Laurent Destailleur
1108656d19 NEW Can set color of the highlight hover line 2015-09-29 15:58:24 +02:00
Laurent Destailleur
60c6510fc1 NEW Can set default value of event type when creating an event (if type 
of event option is used).
 2015-09-29 14:17:03 +02:00
Laurent Destailleur
c05df2ab7e FIX Wizard for restore does not show import command 2015-09-29 09:11:13 +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
aspangaro
0b266a8ee5 Fix : remove viewport for mobile device already declared 2015-09-27 14:15:09 +02:00
Laurent Destailleur
4e77a651d4 Merge pull request #3600 from fmarcet/3.8 
FIX #3599 Not saving legal form
 2015-09-26 11:05:02 +02:00
Juanjo Menent
4fa1be0e35 Issue #3509: Init works 2015-09-26 10:37:36 +02:00
Juanjo Menent
c726afe3bc Merge pull request #3592 from GPCsolutions/select_users 
[Qual] Replaced deprecated select_users()
 2015-09-26 08:44:34 +02:00
Laurent Destailleur
c0433928c6 FIX sortder field was missing so manually added values were moved to 
begin.
 2015-09-25 11:28:49 +02:00
fmarcet
b5b90d1639 FIX #3599 Not saving legal form 2015-09-25 08:50:00 +02:00
Raphaël Doursenaud
b0b552c378 [Qual] Replaced deprecated select_users() 2015-09-24 20:32:35 +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
Laurent Destailleur
9acc75ac12 Test if Zend OPCache is installed 2015-09-22 14:23:24 +02:00
Laurent Destailleur
ee683049a6 Enhance CSS capabilities 2015-09-22 11:24:31 +02:00
Laurent Destailleur
872b59f568 NEW: Add experimental option PDF_ALLOW_HTML_FOR_FREE_TEXT to be able to 
enter pdf footer text with wysiwyg editor.
 2015-09-18 12:34:36 +02:00
Laurent Destailleur
a4ab5f5552 Restore manual install of ckeditor. It seems upgrade with phpcomposer 
make some plugins not working.
 2015-09-18 12:10:47 +02:00
Laurent Destailleur
9cbd236c8c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2015-09-16 22:09:21 +02:00
Laurent Destailleur
313d9ddacd FIX #3534 2015-09-16 22:04:03 +02:00
Laurent Destailleur
1b836dc31e Merge pull request #3408 from aspangaro/develop-60 
New: CkEditor add possibility to choose skin
 2015-09-15 17:09:11 +02:00
Laurent Destailleur
4eedec0274 Fix tool to generate filecheck 2015-09-13 20:25:33 +02:00
Laurent Destailleur
b94fb9e1f3 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-12 18:22:10 +02:00
Laurent Destailleur
9aec4d554b Fix #3215 [User card] [Contact card] [Member card] Error in LDAP tab 2015-09-12 18:21:37 +02:00
aspangaro
3a90bfa6d3 Merge remote-tracking branch 'Upstream/develop' into develop-60 2015-09-10 06:59:23 +02:00
Laurent Destailleur
41803cd868 Merge pull request #3470 from GPCsolutions/develop-3440 
Fix #3440 Only search for core modules in main path
 2015-09-09 20:53:25 +02:00
BENKE Charlie
b4a9a0cafb Allow contact definition on additionnal modules 
If additionnal module use contactelement feature, the module is referenced on element list on contact type
 2015-09-08 13:07:13 +02:00
Laurent Destailleur
28c62fb214 Introduce a function to return a warning by loggers. 2015-09-07 12:21:26 +02:00
Raphaël Doursenaud
97f91d0ef9 Fix #3440 Only search core modules in main path 
Removed duplicated code and used common dolGetModulesDirs() function
 2015-09-05 12:37:43 +02:00
Raphaël Doursenaud
3b5473abe4 NEW Syslog displays configuration errors 2015-09-04 19:10:04 +02:00
Laurent Destailleur
441bb83e64 Fix url of local web sites 2015-09-01 10:08:03 +02:00
Laurent Destailleur
942723ff8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-31 12:13:35 +02:00
Laurent Destailleur
31465fe899 Fix several minor bugs 2015-08-31 12:13:23 +02:00
aspangaro
e4bac2adfd Merge remote-tracking branch 'Upstream/develop' into develop-57 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-08-30 07:39:45 +02:00
Laurent Destailleur
a98985bf37 Fix align 2015-08-28 20:17:36 +02:00
aspangaro
a6701aeb69 New: CkEditor add possibility to choose skin 2015-08-23 15:39:55 +02:00
aspangaro
bd69d37c3a New: Add number of expense reports to pay 2015-08-17 05:29:12 +02:00
philippe grand
ece6d1bf02 the form should be outside table to avoid errors 2015-08-15 11:21:50 +02:00
Laurent Destailleur
d5ed875427 Fix no need the star for this case 2015-08-13 05:23:25 +02:00
Laurent Destailleur
460a78e3e5 Fix translation 2015-08-13 02:13:34 +02:00
Juanjo Menent
d39b6a6bfa Merge remote-tracking branch 'origin/3.8' into develop 2015-08-10 20:46:35 +02:00
Juanjo Menent
c96573dcb4 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-10 20:29:36 +02:00
Juanjo Menent
b3f3cdda3a Merge remote-tracking branch 'origin/3.6' into 3.7 2015-08-10 20:16:05 +02:00
Marcos García de La Fuente
2f921b6431 Fix [ bug #3342 ]: Taxes dictionary page does not accept localized decimals for localtax2 rate 
Close #3342
 2015-08-09 13:46:48 +02:00
Laurent Destailleur
459f9e3db8 Fix avoid warning 2015-07-29 15:54:49 +02:00
Laurent Destailleur
fcc6ce8c31 Fix Option for second level approbation was visible when it should 
not.
 2015-07-29 15:39:34 +02:00
Laurent Destailleur
747e4b5e40 Fix timezone problem with external calendar import. 2015-07-28 18:12:45 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +02:00
Laurent Destailleur
11f434d422 Bad css 2015-07-16 01:02:20 +02:00
Laurent Destailleur
a66985a279 Restore backup feature 2015-07-16 00:58:05 +02:00
Laurent Destailleur
9037d2be50 Fix: test was done on wrong file 2015-07-16 00:20:46 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
Laurent Destailleur
db67ab0b5e Fix wrap into lang list. 
Sync with transifex
 2015-07-15 16:27:01 +02:00
Laurent Destailleur
e31af7f914 Can filter list of setup constant on name and extend visibility to all. 2015-07-12 18:05:56 +02:00
Maxime Kohlhaas
9f9ba12802 New : option to allow credit note without related invoice 2015-07-08 14:32:57 +02:00
Raphaël Doursenaud
b508dce3ff Fix: jquery path 2015-07-06 16:48:10 +02:00
aspangaro
56831ecd16 Correct travis 2015-07-04 16:13:44 +02:00
aspangaro
7bf1ea2cac New: Task(#2567) Add accountancy code for VAT payments 2015-07-04 15:48:43 +02:00
Laurent Destailleur
251fedad48 NEW Can edit email template using WYSIWYG editor 2015-07-04 11:57:55 +02:00
Laurent Destailleur
bddee5d01f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-04 04:11:30 +02:00
Laurent Destailleur
19158979ac Merge pull request #3122 from ywarnier/tva2 
Updates and additions to VAT reports
 2015-07-04 04:05:04 +02:00
Laurent Destailleur
9c80735310 An easier to use dictionary page to edit email template. 
Uniformize look.
 2015-07-04 03:28:52 +02:00
Laurent Destailleur
0ac43211ad NEW: Add help tooltips on fields of dictionary edit pages. 
Fix: visible list of tasks are for opened project only.
 2015-07-04 02:08:06 +02:00
Laurent Destailleur
6ef0b8e330 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-01 21:17:05 +02:00
Yannick Warnier
3a8c93522f Convert " " to \t to match custom coding conventions 2015-06-30 15:53:58 -05:00
Laurent Destailleur
b766f99acc Uniformize look. 
Make code to manage link "Now" on calendar more generic.
 2015-06-30 21:50:24 +02:00
Laurent Destailleur
276f057acf Clean trigger codes 
Better error message when we insert duplicate barcode.
 2015-06-30 16:10:03 +02:00
Laurent Destailleur
ae5b779652 Uniformize code 2015-06-30 01:34:17 +02:00
Laurent Destailleur
ceb9955efc Merge branch 'develop-patch43' of https://github.com/aspangaro/dolibarr into aspangaro-develop-patch43 
Conflicts:
	htdocs/contact/list.php
 2015-06-27 02:27:34 +02:00
Laurent Destailleur
0fe0c989ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-26 17:36:54 +02:00
Laurent Destailleur
8f691138e8 NEW Can edit Background color for Top menu and Background color for 
table title line (works only with theme menu eldy).
 2015-06-26 16:21:09 +02:00
Laurent Destailleur
936c46d219 Better error/setup messages. 2015-06-26 13:18:40 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
aspangaro
452733263d Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT 2015-06-25 06:37:26 +02:00
Laurent Destailleur
040a643ee9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/element.php
 2015-06-23 18:34:39 +02:00
Laurent Destailleur
27cc7ef2b3 Time spent 2015-06-23 10:13:08 +02:00
Laurent Destailleur
a27212644e NEW Can add project search on left menu search area 2015-06-22 11:55:21 +02:00
Laurent Destailleur
d780c03651 Fix default buttone 2015-06-21 03:47:16 +02:00
Laurent Destailleur
4f1538f502 Introduce table llx_c_holiday_type 2015-06-21 03:19:15 +02:00
Laurent Destailleur
2c5ef858d0 NEW Filter "active" by default on user list. 
Fix label of permission of project module
 2015-06-20 20:35:57 +02:00
Laurent Destailleur
ba5d6318ef Debug the integrity check feature. 2015-06-20 14:24:22 +02:00
Laurent Destailleur
a7ce414d23 Fix translation 2015-06-20 14:15:32 +02:00
Raphaël Doursenaud
95debcc376 Fix nophoto image path on company admin 2015-06-10 19:49:09 +02:00
Raphaël Doursenaud
4aee11e54b Make default avatar images public to allow Gravatar proxying 
Fix #2985
 2015-06-08 17:23:02 +02:00
Laurent Destailleur
30f6cd08cf Merge pull request #2943 from aspangaro/develop-donation2 
New: Add object ot the company & Add picture cerfa logo
 2015-06-05 15:58:47 +02:00