lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,632 Commits 43 Branches 150 Tags 886 MiB
9f795331f5
Commit Graph

35814 Commits

Author SHA1 Message Date
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
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
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
Juanjo Menent
a4f1c7eb50 Fix: Suppliers invoice mask fails using {tttt} in numbering 
Conflicts:
	ChangeLog
 2014-05-06 10:04:02 +02:00
Juanjo Menent
011fe254a6 Fix: Suppliers invoice mask fails using {tttt} in numbering 2014-05-06 09:59:10 +02:00
Jean-François VIAL
4bcb80960a escape all $id used in sql queries 2014-05-06 00:06:54 +02:00
Jean-François VIAL
60fd9cf463 Update the test_sql_and_script_inject function to block web-shell drops 
block web-whell SQL injections by blocking INTO {outfile | dumpfile} sequences
 2014-05-05 23:46:21 +02:00
Laurent Destailleur
af9d2d7545 Fix: phpunit error 2014-05-05 20:17:11 +02:00
Laurent Destailleur
48bab56697 Transifex sync 2014-05-05 19:12:52 +02:00
philippe
a04cd99090 fix : no room when number of pages sup than 9 2014-05-05 19:03:25 +02:00
Laurent Destailleur
dca53accaf Fix: translation 2014-05-05 18:30:07 +02:00
Laurent Destailleur
131f133e07 New: Merge free product and predefined product area to enter new 
product (Supplier orders now use same template than customer
orders/proposal/invoices).
 2014-05-05 17:59:43 +02:00
Laurent Destailleur
d224128c46 New: Merge free product and predefined product area to enter new 
product.
 2014-05-05 14:30:08 +02:00
Laurent Destailleur
cc8dcacbc9 New: DolEditor can accepts percent instead of nb of cols for textarea 
mode.
 2014-05-05 13:41:25 +02:00
Marcos García de La Fuente
ae28727fea Improving documentation of Societe class 2014-05-05 12:53:46 +02:00
Marcos García de La Fuente
8532f967af Missing Copyright info 2014-05-05 12:24:39 +02:00
Marcos García de La Fuente
d0e5d9fd1b Improved usability of install wizard 2014-05-05 12:08:19 +02:00
Laurent Destailleur
33ac8cc5f3 Qual: uniformize code for propertie dateh (removed dateadh), for class 
Cotisation.
 2014-05-05 00:42:52 +02:00
Laurent Destailleur
63100c9c06 Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +02:00
Laurent Destailleur
bcdf3e8a51 New: The combo list of juridical status is now sorted 2014-05-04 23:46:36 +02:00
Laurent Destailleur
27b12df103 Fix: CRLF 2014-05-04 21:19:24 +02:00
Laurent Destailleur
d584d29ecf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-04 21:11:40 +02:00
Laurent Destailleur
61e1500d12 Merge branch 'adodbtimeupdate' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-adodbtimeupdate

Conflicts:
	COPYRIGHT
 2014-05-04 21:10:54 +02:00
Laurent Destailleur
93393db991 Merge pull request #1539 from defrance69/patch-7 
Update index.php
 2014-05-04 19:15:21 +02:00
Laurent Destailleur
9ebcec5b4e Fix: duplicate declaration of property 2014-05-04 19:07:30 +02:00
BENKE Charles
cefc62b20f Update index.php 2014-05-04 18:42:58 +02:00
BENKE Charles
b12e87abc3 Update index.php 
add the categories pie graph on product too (and correct some bug)
 2014-05-04 18:42:00 +02:00
BENKE Charles
769c793580 Update products.lang 2014-05-04 18:36:45 +02:00
Laurent Destailleur
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval 
Qual: Remove the closing PHP tag
 2014-05-04 18:08:37 +02:00
Laurent Destailleur
5b5a894aaf Merge pull request #1567 from marcosgdf/doc 
Improved documentation of Societe and started type hinting variables
 2014-05-04 18:07:08 +02:00