Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,480 Commits 36 Branches 189 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

8581 Commits

Author SHA1 Message Date
aspangaro
638563dc5d Fix missing language key in holiday type dictionary 2016-11-22 05:54:44 +01:00
aspangaro
38a31cbd28 Fix missing key language in dictionary email models 2016-11-22 05:25:08 +01:00
IJ
b631db1d60 New: Add Hidden Options Quick Reference Link 
Add the dolibarr wiki link for quick reference from the page Setup>Other Setup
 2016-11-22 02:29:25 +00:00
aspangaro
213e7d1cd7 Fix Missing language key for dictionary format card 2016-11-21 21:49:08 +01:00
aspangaro
356b76d588 Fix missing language key 2016-11-20 22:35:26 +01:00
Laurent Destailleur
1c17335d34 FIX Move translation key in correct file 2016-11-20 18:19:39 +01:00
Laurent Destailleur
ff4fa9977c FIX #5895 2016-11-20 15:47:05 +01:00
IJ
66693c5268 Update products.lang 2016-11-19 22:42:03 +00:00
IJ
9bb60e8d2c Update agenda.lang 2016-11-19 22:41:35 +00:00
IJ
5a8b844c49 Update other.lang 2016-11-19 22:41:08 +00:00
IJ
d5fe7b8b9c Add Search Tip for User 
Add a simple tip on the search strings which could be used by the end user when they are searching from the main search box.
Tested strings are '*' and *|*
This would be very useful to the end user and new users
 2016-11-19 12:21:47 +00:00
IJ
6ebafe1a87 Add Translation String for Agenda 
Add translation string so it can be used independently for the top menu
 2016-11-19 11:32:28 +00:00
IJ
5c46095fa3 Add Translation String for Tools 
Add translation string so it can be used independently for the top menu
 2016-11-19 10:52:30 +00:00
IJ
f96fd895e3 Add Products/Services Menu Translation String 
Add the translation string into language file
 2016-11-19 10:40:45 +00:00
Laurent Destailleur
e9b78db1ac Several bug fixes: 
missing import_key field, ref generator parameter must be task not
project, import must use css, serious database integrity problem
accepting duplicate tasks.
 2016-11-19 02:16:12 +01:00
Laurent Destailleur
5816c86e07 Debug accountancy module 2016-11-17 17:51:10 +01:00
Laurent Destailleur
7197b6ce0c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-11-15 12:00:35 +01:00
Laurent Destailleur
06865b65e9 Debug accountancy module 2016-11-15 11:59:16 +01:00
Laurent Destailleur
598748b4db Merge pull request #5988 from aljawaid/develop 
Add PayPal Missing Translation String
 2016-11-14 21:49:33 +01:00
Laurent Destailleur
bfd1ce0095 Fix translation 2016-11-14 15:25:45 +01:00
Laurent Destailleur
62e0d4ec3f FIX Several problems into shipment management with lot enabled 2016-11-14 14:34:15 +01:00
Laurent Destailleur
cc70b51ba3 Fix missing warning 2016-11-14 02:25:59 +01:00
Laurent Destailleur
381b77850c Fix do not show cloning of virtual product if option is off 2016-11-14 02:08:41 +01:00
Laurent Destailleur
a369514e46 Tooltip help better 2016-11-13 20:43:34 +01:00
Maxime Kohlhaas
5f704fe5e5 Import update, new way of working with a select 2016-11-13 09:03:34 +01:00
IJ
1d2d21de09 Add PayPal Missing Translation String 
Add PayPal missing translation string to expense report payment type
 2016-11-13 00:36:24 +00:00
Laurent Destailleur
7cf4703b73 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-11-12 22:52:48 +01:00
Laurent Destailleur
63162c1bac Merge branch 'develop' of https://github.com/aljawaid/dolibarr into 
aljawaid-develop

Conflicts:
	htdocs/langs/en_US/agenda.lang
	htdocs/langs/en_US/bills.lang
 2016-11-12 22:51:31 +01:00
IJ
c2f1826ac9 Add status 2016-11-12 21:36:47 +00:00
IJ
fd63c91a18 Add Missing Translation String - Expense Report 
Add Debit/Credit Card (text) to Expense Report payment type form fields when used.
 2016-11-12 21:00:21 +00:00
Laurent Destailleur
348e004da6 Minor fixes in css 2016-11-12 16:39:08 +01:00
aspangaro
8909b4111d Add options on getNomUrl 2016-11-12 10:41:57 +01:00
Maxime Kohlhaas
d18adc1231 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option 2016-11-12 09:02:35 +01:00
Laurent Destailleur
cd9f1db229 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
 2016-11-11 15:12:30 +01:00
Laurent Destailleur
e4617ec76c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/filemanagerdol/connectors/php/config.php
	htdocs/viewimage.php
 2016-11-11 15:03:05 +01:00
aspangaro
c65678d00a Update cactus numbering model 2016-11-11 07:36:26 +01:00
Laurent Destailleur
e4c4ced5a3 Complete work on usin dol_banner 2016-11-11 01:55:53 +01:00
Laurent Destailleur
eaa2125373 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/card.php
	htdocs/projet/class/project.class.php
	htdocs/projet/list.php
 2016-11-10 11:40:39 +01:00
Laurent Destailleur
9fd5ddf807 NEW Add REST API for projects 2016-11-09 22:54:51 +01:00
philazerty
24c12df356 Update companies.lang 
Ajout du Gabon
 2016-11-09 12:16:41 +01:00
Laurent Destailleur
c45c24f80c FIX Must use external link into a forged email content. 2016-11-08 23:18:43 +01:00
Laurent Destailleur
d1446bb7ef NEW Show subtotal into list of linked elements 2016-11-08 19:19:30 +01:00
Laurent Destailleur
6d70d39bbd NEW Add type "url" as possible extrafield. 2016-11-08 17:21:26 +01:00
Laurent Destailleur
7a94cfc994 NEW Better filtering of automatic/manually inserted events. 2016-11-08 13:03:20 +01:00
Laurent Destailleur
341e014a3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/document.php
 2016-11-08 11:36:31 +01:00
Laurent Destailleur
5fb8ba8ee7 Better help to explain suggested account 2016-11-07 11:42:20 +01:00
Laurent Destailleur
84ed82bb08 Better error message 2016-11-07 00:20:30 +01:00
Marcos García de La Fuente
286095f5cd Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/core/tpl/objectline_create.tpl.php
#	htdocs/fourn/facture/card.php
#	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-11-06 15:01:40 +01:00
Laurent Destailleur
69a6646433 Sync transifex 2016-11-06 12:51:37 +01:00
Laurent Destailleur
55e367742a Sync transyfex 2016-11-06 12:50:32 +01:00