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

258 Commits

Author SHA1 Message Date
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-27 14:21:47 +02:00
Laurent Destailleur
3c6b1f17d1 Fix: print of a function that already contains the print. 2013-07-27 14:10:57 +02:00
Laurent Destailleur
51d11ff190 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/includes/tcpdf/tcpdf.php
	htdocs/langs/el_GR/other.lang
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/main.inc.php
	test/phpunit/NumberingModulesTest.php
 2013-06-09 16:49:47 +02:00
Laurent Destailleur
050819ce0b Fix: dead code 2013-06-09 16:15:12 +02:00
Laurent Destailleur
ee890a87a3 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/prelevement/ligne.php
	htdocs/langs/en_US/admin.lang
 2013-05-14 01:15:05 +02:00
Marcos García
62475866e3 Style improvements and fixed a "bug" that showed "()" when no note was entered 2013-05-12 12:06:45 +02:00
Marcos García
dcb6bb4c2e Improvement to holidays module 
Creation date can't be higher than today
 2013-05-12 11:38:17 +02:00
Marcos García
c61f48a98f Added missing translation in holidays module 2013-05-12 11:36:49 +02:00
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-11 15:26:24 +02:00
Marcos García
9f537cedd1 Replaced "Jours" with DurationDays translation key 2013-05-06 17:48:20 +02:00
Marcos García
da61a24831 Missing translations 2013-05-06 17:47:53 +02:00
Marcos García
f5b04fdfe5 Stetic fix: Select was not valigned 2013-05-06 17:47:21 +02:00
Marcos García
896a60296c Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into holidays-improvements 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-06 17:22:31 +02:00
Juanjo Menent
0e49ec93f9 Merge pull request #929 from marcosgdf/holidays-minor 
Minor changes in holidays module
 2013-05-06 08:17:25 -07:00
Marcos García
bd9849c1aa Fixed bug with holidays log 2013-05-06 17:15:49 +02:00
Juanjo Menent
a53e4123eb Merge pull request #927 from marcosgdf/holidays-bug 
Fixed bug with holidays log
 2013-05-06 08:14:46 -07:00
Marcos García
bbe1db0e9f Replaced addslashes with $this->db->escape 2013-05-06 17:13:43 +02:00
Marcos García
e1913f4a13 Stetic fix: Select was not valigned 2013-05-06 17:07:20 +02:00
Marcos García
7e11f7466a Missing translations 2013-05-06 17:07:12 +02:00
Marcos García
05be90a220 Using month selector instead of direct input 2013-05-06 17:06:41 +02:00
Marcos García
f4973d5aa9 Holidays log now shows recent changes first 2013-05-06 17:04:21 +02:00
Marcos García
9935dad500 Wrong indentation 2013-05-06 17:04:15 +02:00
Marcos García
b830c1dd8c Removed "event" word from event description and changed ActionTypeCP to Description 2013-05-06 17:04:04 +02:00
Marcos García
0846f4678b User links in log view 2013-05-06 16:53:22 +02:00
Marcos García
d7a7f316d3 Replaced "Jours" with DurationDays translation key 2013-05-06 16:51:08 +02:00
Marcos García
d0635901a6 Fixed bug with holidays log 2013-05-06 16:45:03 +02:00
Marcos García
e2a73839bc Replaced addslashes with $this->db->escape 2013-05-04 20:17:05 +02:00
Marcos García
3eb6d3edb1 Translated some comments 2013-05-04 20:09:39 +02:00
Marcos García
c21390ab83 New: [ task #858 ] Holiday module: note on manual holiday assignation 2013-05-04 20:08:17 +02:00
Laurent Destailleur
f8b4551ef6 Merge pull request #901 from marcosgdf/develop 
Holidays module improvements
 2013-04-29 10:28:47 -07:00
Laurent Destailleur
cd6ceaf3f4 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-04-29 19:04:15 +02:00
Marcos García
7dd457d2df Added DurationDays string to the table 2013-04-29 18:01:26 +02:00
Marcos García
8837caeb6f Style improvement 2013-04-29 17:57:24 +02:00
Marcos García
b9429fc98e Fixed a bug when showing users to define holidays 2013-04-29 17:24:02 +02:00
simnandez
fd85755461 Fix: [ bug #855 ] Holiday approval email in French 2013-04-29 12:55:14 +02:00
simnandez
00adb1b9ab Fix: [ bug #855 ] Holiday approval email in French 2013-04-29 12:46:07 +02:00
Marcos García
54fc731df7 Fix: [bug #856] Mail error if destination user doesn't have an email 2013-04-28 01:58:57 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2013-04-28 01:24:58 +02:00
simnandez
d982148b7b Fix: [ bug #855 ] Holiday approval email in French 2013-04-27 17:20:02 +02:00
Marcos García
0672d10a3f Fixed typos 2013-04-27 14:54:03 +02:00
Marcos García
bd2b363e40 Modified traslation keys to reflect expected translation 2013-04-27 14:50:14 +02:00
Marcos García
652e0c1b5f Corrected translation key 2013-04-26 17:19:14 +02:00
Laurent Destailleur
5893fadb58 Look: Minor style enhancement 2013-04-21 17:56:29 +02:00
Marcos García
651b1ae7ce Refactor + es_ES translations improvement + minor stetic change 2013-04-20 12:55:31 +02:00
Laurent Destailleur
8a0e111417 Fix: Bad array type 2013-04-15 12:39:34 +02:00
Marcos García
0ac7696bc0 Improved holidays module translations 
Conflicts:
	htdocs/holiday/fiche.php
	htdocs/langs/fr_FR/holiday.lang
 2013-04-15 09:29:26 +02:00
Marcos García
421dc07077 Improved es_ES holidays translations 2013-04-15 09:25:41 +02:00
Marcos García
6d896a8558 Improved holidays module translations 2013-04-15 00:53:06 +02:00
Marcos García
deaa63960e Improved es_ES holidays translations 2013-04-15 00:18:08 +02:00
Laurent Destailleur
2f5709e3cb Fix: Some fix into holiday module 2013-04-14 01:21:54 +02:00