Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

6584 Commits

Author SHA1 Message Date
Laurent Destailleur
cc86e280f9 Merge branch 'task712' of github.com:KreizIT/dolibarr into 
KreizIT-task712

Conflicts:
	ChangeLog
 2014-08-14 00:18:51 +02:00
Laurent Destailleur
98f140962a Merge remote-tracking branch 'origin/3.6' into develop 2014-08-13 19:25:55 +02:00
Andrelec1
8b6d613cb0 Hidde version on login page 
Create option and use it in login template
 2014-08-12 12:29:20 +02:00
astebert
9c7647a7ae Update bills.lang 
Ligne 252 : Changement grammatical
- de "Paiements issue de l'acompte"
- en "Paiement issu de l'acompte"
 2014-08-12 11:45:11 +02:00
Andrelec1
3548f72d8a Start implement 2014-08-11 18:14:40 +02:00
Laurent Destailleur
bd29d3c7f4 Sync from transifex 2014-08-08 14:38:20 +02:00
Laurent Destailleur
06fcbe12a8 Add MAIN_DEFAULT_WORKING_DAYS and MAIN_DEFAULT_WORKING_HOURS into 
company setup.
 2014-08-08 10:44:10 +02:00
KreizIT
973d61fe13 [ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice 2014-08-07 16:23:02 +02:00
Laurent Destailleur
17aed0f360 Prepare to be able to send bcc according to email type. 2014-08-05 09:28:07 +02:00
Laurent Destailleur
7d3c266a1d Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/agenda_other.php
	htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
	htdocs/install/mysql/migration/repair.sql
 2014-08-04 00:02:00 +02:00
Laurent Destailleur
51f1577c84 Fix: Field for user into event is "owner". 2014-08-03 23:32:36 +02:00
Laurent Destailleur
42008ae8cb Fix: Bad translation 2014-08-03 11:35:35 +02:00
Laurent Destailleur
be76fd93fd New: Add user of creation and validation on invoice export 2014-08-01 22:24:25 +02:00
Laurent Destailleur
f58da0fa73 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/langs/fr_FR/main.lang
 2014-08-01 02:05:38 +02:00
Laurent Destailleur
80e8ff8db3 Sync from transifex 2014-08-01 02:01:51 +02:00
Laurent Destailleur
c895c892a5 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2014-07-29 01:17:00 +02:00
Laurent Destailleur
c9d27383a4 Fix: When option to use optimize display for text borwser and blin 
person is on, box addon was broken.
 2014-07-29 00:50:57 +02:00
Laurent Destailleur
1f936ef584 Better text to describe reason of option 2014-07-28 21:43:06 +02:00
Laurent Destailleur
b964f9e9e3 New: Add info page about browser. 
Qual: Removed dedicated code to change top menu according to
dol_optimize_smallscreen. We must use instead size of screen into css.
 2014-07-27 14:13:25 +02:00
Laurent Destailleur
db091896a5 Prepare 3.6. 
Use google adsense tag of foundation for doxygen doc pages.

Version is no more encoded int odoxygen.

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/impayees.php
	htdocs/filefunc.inc.php
 2014-07-26 18:10:51 +02:00
Laurent Destailleur
ed47b27ed9 Merge pull request #1764 from frederic34/patch-3 
Update main.lang
 2014-07-25 22:17:23 +02:00
frederic34
5239620356 Update main.lang 2014-07-23 10:02:33 +02:00
frederic34
c28c6e578e Update main.lang 2014-07-23 10:00:32 +02:00
frederic34
a01c985018 Update main.lang 2014-07-21 19:21:08 +02:00
frederic34
f0bfe46ebc Update main.lang 2014-07-21 19:19:04 +02:00
Laurent Destailleur
dec7fe42af Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/commande/fiche.php
 2014-07-20 15:37:50 +02:00
Laurent Destailleur
7a8f244ae9 Fix: Translation 2014-07-19 16:03:55 +02:00
Marcos García de La Fuente
7794101e10 Corrected VAT expenses behaviour name 2014-07-19 05:36:29 +02:00
Laurent Destailleur
a6992e116b Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
 2014-07-18 23:24:39 +02:00
Laurent Destailleur
dbae31b982 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-07-18 20:17:18 +02:00
Laurent Destailleur
e94ffceac9 Transifex sync for 3.6 2014-07-18 20:16:46 +02:00
Juanjo Menent
2564413a70 Fix: Translation 2014-07-17 11:44:10 +02:00
Juanjo Menent
6e1f6f7485 Trad: Update es_ES from transifex 2014-07-17 11:14:47 +02:00
Laurent Destailleur
ef2629d309 Fix: Translation 2014-07-17 02:02:35 +02:00
Laurent Destailleur
9394f3f405 Fix: Translation 2014-07-17 01:56:34 +02:00
Laurent Destailleur
92a5ebc459 - New: Home page of project area shows list of draft project (like other 
main page).
- New: Can search on project ref or string from project main page (like
other main page).
 2014-07-17 01:28:01 +02:00
Cedric
769c9a9b66 FIX stock inconsistency when activating batch management on product which already have stock 2014-07-15 11:22:16 +02:00
Laurent Destailleur
4dfaf9ce38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-11 13:56:57 +02:00
Laurent Destailleur
a6c1cfca7e Fix: bad translation 2014-07-11 12:42:47 +02:00
juanjo
fb3392a7b2 Trad: Update from Transifex 2014-07-10 19:49:20 +02:00
Laurent Destailleur
688d58413b Merge pull request #1710 from aspangaro/develop-accounting2 
New feature :: Add fiscal year
 2014-07-07 21:28:35 +02:00
Laurent Destailleur
1a2ed2138b New: Add new type of event (when type of events are used, not by 
default)
 2014-07-06 21:25:25 +02:00
Laurent Destailleur
ce3fa14511 New: Add event FICHINTER_CLASSIFY_BILLED into list of possible events to 
create an automatic event into agenda.
Qual: Removed hard coded rowid into data init.
 2014-07-06 19:25:15 +02:00
aspangaro
9eaeaae2fb Merge branch 'Upstream/develop' 2014-07-05 08:48:51 +02:00
aspangaro
be78e96313 Bug fix & add tab info 2014-07-05 08:47:01 +02:00
Juanjo Menent
9aa234255d [ task #1063 ] Allow edit localtaxes rate for thirds 2014-07-04 18:26:56 +02:00
Juanjo Menent
74b42f6cb4 [ task #1063 ] Allow edit localtaxes rate for thirds 2014-07-04 17:31:34 +02:00
Juanjo Menent
2ca01741ac [ task #1063 ] Allow edit localtaxes rate for thirds. Language 2014-07-04 17:17:35 +02:00
Juanjo Menent
8e4e08f907 [ task #1063 ] Allow edit localtaxes rate for thirds. Improve visu 2014-07-04 16:48:42 +02:00
Juanjo Menent
4063260cc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-04 16:16:52 +02:00