Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 00:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,916 Commits 36 Branches 190 Tags
c72e7e6a973bcb58ffb51a22944b68f371769bc0
Commit Graph

9016 Commits

Author SHA1 Message Date
Laurent Destailleur
7ec4bc055a Sync transifex 2016-12-10 11:51:55 +01:00
florian HENRY
3b25bf2ee6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_advtaremailng 2016-12-10 11:37:07 +01:00
Laurent Destailleur
aac44d5797 Add cambodgian files 2016-12-10 10:25:02 +01:00
Laurent Destailleur
5353aa6efe Better error management when creating bookkeepin entries 2016-12-10 02:38:07 +01:00
florian HENRY
a0e8b509db Finish Advance target emailing feature (back from hashes since 3.7) 2016-12-09 19:06:59 +01:00
Laurent Destailleur
d5e417010f Complete work on dol_banner 2016-12-09 11:16:04 +01:00
Laurent Destailleur
9efcda6714 Merge pull request #6086 from fappels/develop-work-on-warehouse-status 
New continue work on warehouse status #5115
 2016-12-07 13:06:07 +01:00
Laurent Destailleur
6b5ce5c699 Merge pull request #6084 from milamberspace/Fix_ICE_Maroc 
Fix the new 'Identifiant Commun de l'Entreprise' label in L10N files …
 2016-12-07 12:00:03 +01:00
fappels
085d44eaba Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-12-06 20:15:45 +01:00
Laurent Destailleur
2a8f23e8c5 Fix labels 2016-12-06 15:03:39 +01:00
fappels
c911f906c8 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-12-05 11:36:20 +01:00
Milamber
e4006602f3 Fix the new 'Identifiant Commun de l'Entreprise' label in L10N files for Morocco (Maroc) 
Fix issue in pdf.lib.php to add the Prof ID 5 and 6

Ref: http://www.ice.gov.ma/ICE/
 2016-12-05 08:04:34 +00:00
Laurent Destailleur
4b831537e5 Fix several problem in notes management of template invoices. 2016-12-04 21:27:08 +01:00
Laurent Destailleur
788cbf9a01 Complete work on dol_banner on contracts 2016-12-04 13:30:17 +01:00
Laurent Destailleur
2b8fbf200a Complete work on the new dol_banner 2016-12-03 21:29:49 +01:00
Laurent Destailleur
81a3235cf6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/facture/list.php
 2016-12-03 16:01:18 +01:00
fappels
a7a20f45a1 Remove Only shipping and dispatch status 
Remove Only shipping and dispatch status, better to create new future
option 'Routing' for this.
 2016-12-02 11:03:21 +01:00
Laurent Destailleur
d86c3931e2 Fix translation 2016-11-30 09:09:09 +01:00
Laurent Destailleur
f267273251 Missing translation 2016-11-29 10:38:27 +01:00
Laurent Destailleur
83972b39ce Complete work on dol_banner. Fix errors due to missing columns. 2016-11-28 23:58:36 +01:00
Laurent Destailleur
4eb397557f Debug accounting module 2016-11-28 19:30:55 +01:00
gauthier
9a1309256d Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received 2016-11-28 17:13:09 +01:00
Laurent Destailleur
b2ed3f3053 Fix translation 2016-11-28 16:32:14 +01:00
Laurent Destailleur
5e5ce0043e Debug module ECM. 2016-11-28 12:03:33 +01:00
Marcos García de La Fuente
cf0ee36150 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-11-27 18:10:01 +01:00
Laurent Destailleur
017b18d5c6 Fix #6037 #6041 2016-11-27 16:09:16 +01:00
Laurent Destailleur
2c9edd4205 Maxi debug on list. Fix responsive design. 2016-11-27 13:49:46 +01:00
Laurent Destailleur
a8c3ce4e55 FIX A form should not be inside a table. Create javascript troubles. 2016-11-26 12:21:50 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
gauthier
c433829d27 NEW : interface 2016-11-25 11:04:42 +01:00
gauthier
480b08bd0b NEW : convert exceiss received to reduc 2016-11-24 15:48:04 +01:00
Laurent Destailleur
dea2ab06f5 Fix missing translation 2016-11-23 12:31:35 +01:00
Laurent Destailleur
c1628be9c0 Code comment to add some explanations 2016-11-23 12:29:42 +01:00
Laurent Destailleur
15468d88a0 FIX #6007 2016-11-22 20:36:01 +01:00
Laurent Destailleur
94607d3dea FIX #6007 2016-11-22 20:35:51 +01:00
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