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

41707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
70cccc907a Fix: Check env before test to be sure module ecotax is not enabled 
(this change result).
 2014-05-08 15:30:31 +02:00
Laurent Destailleur
7bfbc4cbf3 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/modExpedition.class.php
	htdocs/projet/class/project.class.php
 2014-05-07 19:30:19 +02:00
Laurent Destailleur
51baae16a4 Merge pull request #1584 from FHenry/develop 
Better error return for project delete method
 2014-05-07 19:27:28 +02:00
Laurent Destailleur
4bf86508a5 Merge pull request #1583 from FHenry/3.5 
Fix error return project deletion
 2014-05-07 19:25:02 +02:00
Laurent Destailleur
ef2a8a0b09 Merge pull request #1582 from marcosgdf/changelog 
Changelog
 2014-05-07 19:18:41 +02:00
Laurent Destailleur
ac27884b88 Fix: [ bug #1366 ] Special characters are HTML encoded with WYSIWYG 
module.
 2014-05-07 19:13:02 +02:00
Laurent Destailleur
16b3ec8923 Fix: concat of string must use dol_concat. 2014-05-07 19:06:47 +02:00
Laurent Destailleur
1bc3558307 Fix: Better html detection 2014-05-07 19:06:15 +02:00
Florian HENRY
0e2497e710 [ bug #1377 ] Warning: get_class() called without object from outside a 
class
 2014-05-07 18:19:46 +02:00
Florian HENRY
395e09d64d fix warning message into function2.lib.php 2014-05-07 17:25:50 +02:00
Florian HENRY
50a6cac094 Add hook on comm/fiche.php to manage doAction and buttons 2014-05-07 17:23:38 +02:00
Florian HENRY
e35008b534 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-07 15:13:47 +02:00
Florian HENRY
45e134bfef Better error return for project delete method 2014-05-07 15:11:46 +02:00
Florian HENRY
3f22bc7009 Better error management in delete project method 2014-05-07 15:08:44 +02:00
Florian HENRY
e6708a5072 Fix error return project deletion 2014-05-07 15:05:40 +02:00
Laurent Destailleur
40577ab445 New: Can enter holiday for someone else if user has permission for. 2014-05-07 15:03:05 +02:00
Laurent Destailleur
9add45aea3 Qual: Mutualize code. 2014-05-07 13:22:02 +02:00
Laurent Destailleur
845f764f93 Increase default size of image 2014-05-07 12:21:14 +02:00
Marcos García de La Fuente
fb7f08b33a Corrected changelog message 2014-05-07 10:43:19 +02:00
Marcos García de La Fuente
8681079fa7 Fixed CR 2014-05-07 10:42:13 +02:00
Marcos García de La Fuente
7fe5389adf Updated changelog 2014-05-07 10:41:43 +02:00
Laurent Destailleur
a127f09377 - New: Paypal/paybox email sent after backcall of a payment is now a 
formated and translated HTML content. For member subscription
renewal, there is also a link to member.
- New: When a subscription is recorded with invoice and payment: the
document (PDF) of invoice is also generated and the invoice is set
to status paid.
 2014-05-07 10:33:10 +02:00
Laurent Destailleur
3122944ab7 Fix: Email html format was missing br. 2014-05-07 10:05:32 +02:00
Laurent Destailleur
182dd774b6 Fix: phpunit regression 2014-05-07 09:54:36 +02:00
Laurent Destailleur
95b5094e94 Fix: phpunit regression 2014-05-07 09:33:56 +02:00
Laurent Destailleur
9f795331f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
 2014-05-06 23:58:17 +02:00
Laurent Destailleur
fe43d10c79 Fix: [ bug #1360 ] note indicator for member tab. 2014-05-06 23:42:19 +02:00
Laurent Destailleur
3abede630b Fix: [ bug #1365 ] ODT template tag {company_note} does not get 
replaced.
 2014-05-06 23:36:01 +02:00
Laurent Destailleur
e214cdf231 Fix: [ bug #1365 ] ODT template tag {company_note} does not get 
replaced.
 2014-05-06 23:35:09 +02:00
Laurent Destailleur
99dc3598de Fix: [ bug #1364 ] Duplicate Id on permission 2014-05-06 23:27:44 +02:00
Laurent Destailleur
5a6ad1ef5f Fix: [ bug #1362 ] Note is not saved 
Fix: tr/td balance.
 2014-05-06 23:19:48 +02:00
Laurent Destailleur
5e12459ad1 Fix: Ref and date for social contributions payments were merged into on 
field making not possible to click on ref.
 2014-05-06 22:54:33 +02:00
Laurent Destailleur
460b5296ba Fix: [ bug #1353 ] Email notifications, wrong URL 2014-05-06 22:21:34 +02:00
Laurent Destailleur
7a452519e7 Try to fix [ bug #1363 ] Unable to update from 3.5.1 to 3.5.2 2014-05-06 22:00:54 +02:00
Laurent Destailleur
503924fbbc Fix: Missing cleaning orphelins for contact categories. 2014-05-06 21:56:31 +02:00
Laurent Destailleur
01001592e6 Finished task to merge form of free product and predefined product. 2014-05-06 18:31:39 +02:00
Laurent Destailleur
53a1e7d09a Fix: Script can be ran from non root user, even from a directory with no 
write permissions.
 2014-05-06 16:26:58 +02:00
Laurent Destailleur
1c6c79811d Prepare version 3.5.3 2014-05-06 16:09:13 +02:00
Laurent Destailleur
215ff25ddd Fix: navigation on tab notes for shipment was not working. 2014-05-06 13:51:22 +02:00
Laurent Destailleur
647d431857 Fix: contact of delivery of order not visible into typhon pdf. 2014-05-06 13:43:41 +02:00
Laurent Destailleur
4da918ce01 Update doc 2014-05-06 13:32:37 +02:00
Laurent Destailleur
959b104b78 Fix: the pdf template name for typhon as not correctly set when enabling 
module.
 2014-05-06 13:31:30 +02:00
Laurent Destailleur
c4291c228e Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-06 13:16:06 +02:00
Laurent Destailleur
948e0bf753 Fix: When on delivery receipt, ref of shipment was not visible. Also 
some tabs were missing.
Fix: After deletion of delivery receipt, we must go back to shipment of
delivery receipt.
 2014-05-06 13:15:37 +02:00
Laurent Destailleur
39c0b9e356 Merge 2 tests. Remove checkstyle errors. 2014-05-06 10:44:15 +02:00
Laurent Destailleur
601d3260e9 Merge pull request #1577 from Modulaweb/develop 
Update the test_sql_and_script_inject function to block web-shell drops
 2014-05-06 10:39:58 +02:00
Laurent Destailleur
5740c22a41 Merge pull request #1576 from grandoc/3.5 
fix : no room when number of pages sup than 9
 2014-05-06 10:21:19 +02:00
Laurent Destailleur
efc6472c25 Merge pull request #1575 from marcosgdf/doc 
Improving documentation of Societe class
 2014-05-06 10:20:37 +02:00
Laurent Destailleur
77e85fe821 Merge pull request #1574 from marcosgdf/usability 
Improved usability of install wizard
 2014-05-06 10:12:28 +02:00
Laurent Destailleur
157883a0a8 Merge pull request #1579 from j33f/develop 
escape all $id used in sql queries
 2014-05-06 10:09:07 +02:00