lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,798 Commits 43 Branches 150 Tags 886 MiB
bbe1db0e9f
Commit Graph

3907 Commits

Author SHA1 Message Date
Regis Houssin
3684271627 Fix: avoid error 2013-04-26 16:21:48 +02:00
Regis Houssin
36e6269b24 Fix: big security problem with multicompany 2013-04-26 16:08:02 +02:00
Regis Houssin
34036c2a5c Fix: big security problem with multicompany 2013-04-26 16:07:35 +02:00
fhenry
c988944f1a PDF admin : Add option to hide num TVA intra into adress of customer 2013-04-26 13:25:51 +02:00
fhenry
30ad2f1609 Fix bug in fetch_optionals 2013-04-26 10:51:17 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
jfefe
8835868749 Implement MAIN_DOC_USE_TIMING into project and order ODT 2013-04-26 08:48:44 +02:00
jfefe
8a958c31e3 Use MAIN_DOC_USE_TIMING on invoices (odt) 2013-04-26 08:48:44 +02:00
jfefe
036e81a089 Use MAIN_DOC_USE_TIMING on proposals (ODT) 2013-04-26 08:48:44 +02:00
jfefe
bfc15fb99f Change name of hidden option to add timing in filename (MAIN_DOC_USE_TIMING) 2013-04-26 08:48:43 +02:00
fhenry
d0f44bf25f Add zero entity into extrafeild deletion 2013-04-26 08:46:25 +02:00
Laurent Destailleur
271dcf578f Fix: Better error message during import of csv with records split onto 
several lines.
 2013-04-25 23:49:24 +02:00
Laurent Destailleur
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +02:00
Laurent Destailleur
726c83d2d2 Merge pull request #877 from FHenry/develop 
Fix bug on Extrafield list table type
 2013-04-25 01:23:57 -07:00
Laurent Destailleur
023b6f2e8b Fix: Use entity 2013-04-25 10:22:08 +02:00
Laurent Destailleur
86ea79c860 Fix: dol_check_secure_access_document is also used by viewimage. This 
also solve bug of not found supplier doc and solve some security holes.
 2013-04-25 10:06:54 +02:00
Laurent Destailleur
cce857d6ee Fix: When box is removed, it is added into combo box of available boxes. 2013-04-25 01:35:33 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
fhenry
8c440b3f57 Remove entity check in list table extrafield 2013-04-25 00:14:43 +02:00
fhenry
507da4fc3b Add Zero entity to shared extrafield 2013-04-25 00:09:47 +02:00
fhenry
f1a97d4705 remove ver_export 2013-04-25 00:02:29 +02:00
fhenry
9a0f9477a6 Fix multicompany problem with extrafield list from table 2013-04-25 00:01:38 +02:00
fhenry
7fdf2f3482 Fix for php 5 2013-04-24 23:54:02 +02:00
fhenry
928a1afe18 Fix bug on Extrafield list table type 2013-04-24 21:32:22 +02:00
Laurent Destailleur
3896b99bad Add UK with GB. 2013-04-24 19:14:59 +02:00
fhenry
7b1616d0c5 Better management extrafield from list of table 2013-04-24 19:14:03 +02:00
fhenry
5789a5d6e9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 17:53:59 +02:00
simnandez
436b6259c0 Fix: finish merge 2013-04-24 16:57:46 +02:00
fhenry
9ce7e44f00 use price method rather than price2num. price are use in all PDF, so it 
should be the same on ODT
 2013-04-24 16:47:15 +02:00
Laurent Destailleur
9a2b72f8f8 Compatibility with jmobile 2013-04-24 15:49:43 +02:00
fhenry
41c8a9aa6a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 15:07:03 +02:00
Laurent Destailleur
bca399623f Fix: finish merge 2013-04-24 12:44:36 +02:00
fhenry
d9a2805100 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-24 08:50:51 +02:00
Laurent Destailleur
d5f3f47782 New: Use div for tabs. 2013-04-24 03:56:13 +02:00
fhenry
bd1b440743 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-23 23:28:44 +02:00
Laurent Destailleur
854b9df96d Qual: Clean code of box management 2013-04-23 16:18:26 +02:00
Laurent Destailleur
7dce8d2306 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/launchpad/README
	build/makepack-dolibarr.pl
	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/core/modules/syslog/mod_syslog_file.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
 2013-04-23 14:04:56 +02:00
fhenry
ba0e9c0c19 Fix [ bug #843 ] Erreur SQL box_stock 
fix [ bug #842 ] Erreur SQL Propal
 2013-04-23 14:02:29 +02:00
Laurent Destailleur
3f1f065d4e Fix: log must use the mask defined into setup 
Conflicts:
	htdocs/core/modules/syslog/mod_syslog_file.php
 2013-04-23 12:02:56 +02:00
Laurent Destailleur
78a0c7ace2 Fix: log must use the mask defined into setup 2013-04-23 12:00:02 +02:00
Laurent Destailleur
c8b2ce3d8e Removed warning 2013-04-22 20:46:53 +02:00
Laurent Destailleur
494e9dbe18 Removed warning 2013-04-22 20:45:47 +02:00
Laurent Destailleur
9135fd0272 Merge pull request #868 from jfefe/webservices 
New webservice to retrieve a document (work on invoice, propal, order and generic
 2013-04-22 11:35:35 -07:00
Laurent Destailleur
2c4515f40e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 20:00:01 +02:00
Laurent Destailleur
5d74f228d8 Removed version into trigger page (version on trigger is useless since 
trigger depend on module. Only version of module is required).
 2013-04-22 19:59:41 +02:00
simnandez
de5a57a3c8 Fix: Uniformize creation in orders 2013-04-22 16:23:59 +02:00
fhenry
3fdc57cc56 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-22 16:20:35 +02:00
fhenry
ee4839c92e Better management for ODT to PDF 2013-04-22 15:50:26 +02:00
Regis Houssin
7217d91f13 Fix: missing commit 2013-04-22 15:26:45 +02:00
Regis Houssin
28757c8d88 Fix: missing commit 2013-04-22 15:26:14 +02:00
Regis Houssin
ccf809b14a Fix: broken features 2013-04-22 15:10:15 +02:00
Regis Houssin
29a8c10504 Fix: broken features 2013-04-22 15:09:19 +02:00
jfefe
b5e66cc492 Mutualize code for security check when accessing a document by document.php and bywebservice 2013-04-22 15:00:29 +02:00
Regis Houssin
1be6a2c120 Fix: broken features for fileupload 2013-04-22 14:39:25 +02:00
Regis Houssin
63a5aee80e Fix: broken features for fileupload 2013-04-22 14:37:18 +02:00
Laurent Destailleur
e65e6516c5 Fix: Logon theme on amarok 2013-04-22 14:33:47 +02:00
Laurent Destailleur
54040bed1d Fix: No slash alone 2013-04-22 12:48:56 +02:00
Laurent Destailleur
5cbb0359aa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-22 10:33:46 +02:00
Laurent Destailleur
ee843924dd Fix: Some translation change to have things more clear. 2013-04-22 10:33:06 +02:00
Regis Houssin
ab4a3dcaa7 Fix: missing rename field 2013-04-22 10:18:03 +02:00
Laurent Destailleur
89ad634230 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/langs/fr_FR/holiday.lang
 2013-04-22 01:39:49 +02:00
Laurent Destailleur
9b07271460 Merge pull request #864 from jfefe/doc_ods 
Task [#838] : Can generate ods document on thirdparty
 2013-04-21 16:32:07 -07:00
Laurent Destailleur
11023fa210 Merge pull request #857 from marcosgdf/task-823 
New: [ task #823 ] Shipping_validate email notification
 2013-04-21 16:07:37 -07:00
Laurent Destailleur
e19e0ff557 Fix: Error management 2013-04-22 00:57:56 +02:00
Laurent Destailleur
3f09cbec7e Merge pull request #855 from marcosgdf/minor-refactor 
ECM Refactor
 2013-04-21 15:18:15 -07:00
Laurent Destailleur
9f3164d710 Merge pull request #849 from GPCsolutions/ca_report_improvments 
Improved reports
 2013-04-21 15:13:34 -07:00
Laurent Destailleur
42b3d6e317 Merge pull request #865 from FHenry/develop 
Add extrafield select from table
 2013-04-21 15:12:04 -07:00
Laurent Destailleur
5893fadb58 Look: Minor style enhancement 2013-04-21 17:56:29 +02:00
fhenry
d6514e1cd6 Add extrafield select from table 2013-04-21 17:36:23 +02:00
JF FERRY
642ba10d84 New hidden option to introduce timing value into odt document nam 2013-04-21 17:04:54 +02:00
Laurent Destailleur
f4513d1beb Move option ate better place 2013-04-21 16:01:36 +02:00
JF FERRY
83028b958a Task #838 : retieve extension to work with ods document 2013-04-21 15:12:48 +02:00
JF FERRY
fcf1eeba20 Task #838 - change regex to look at ods document too 2013-04-21 14:55:32 +02:00
Marcos García
82e3a8d0b9 New: [ task #823 ] Shipping_validate email notification 2013-04-21 14:14:30 +02:00
Marcos García
293fc89a9f Missing copyright 2013-04-21 12:45:34 +02:00
Marcos García
17902a8455 Removed var_dump 2013-04-21 12:44:13 +02:00
Marcos García
7befeae371 ECM Refactor 2013-04-21 12:42:58 +02:00
Laurent Destailleur
ab2709f684 Filter on agenda event are autoselected on "manual event". 2013-04-21 12:26:44 +02:00
Laurent Destailleur
a7f169d102 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-20 23:43:19 +02:00
Laurent Destailleur
c282ff91d6 Fix: pgsql compatibility 2013-04-20 23:43:02 +02:00
Laurent Destailleur
9c11b6a246 Merge pull request #851 from FHenry/develop 
Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF
 2013-04-20 12:02:16 -07:00
Laurent Destailleur
12caa20e38 Merge pull request #850 from atm-maxime/develop 
Carrier conf modification
 2013-04-20 11:42:44 -07:00
Laurent Destailleur
4d54b8a22f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-20 20:30:48 +02:00
Laurent Destailleur
dd13c334c7 New: Compatibility with jmobile 2013-04-20 20:30:18 +02:00
Laurent Destailleur
2008fd1419 Fix: Optimize for small screen 2013-04-20 17:49:24 +02:00
fhenry
dd8a84bce3 Fix [ bug #833 ] Accounting journals are broken 2013-04-20 13:08:06 +02:00
Maxime Kohlhaas
cf945f0187 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-04-20 13:00:33 +02:00
fhenry
413ee7ec78 Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF (only if 
libreoffice/jodconverter/exec shell right)
 2013-04-20 10:44:01 +02:00
Raphaël Doursenaud
f2bd1461b2 Improved reports 
Added amount without VAT for "CREANCES-DETTES" mode
Added turnover by products/services
Added categories filter for users and products/services
Added period management
Added list sorting
 2013-04-20 07:33:10 +02:00
fhenry
62c9366d69 fix debug 2013-04-20 07:21:26 +02:00
fhenry
75194ddb57 Ifo user visibility and maxlength product label regarding db column size 2013-04-20 07:05:31 +02:00
Laurent Destailleur
162ccf68b6 Merge pull request #841 from FHenry/develop 
fix [ bug #825 ] User first name not visible into users->perms
 2013-04-19 17:21:16 -07:00
fhenry
e2d0d0d414 Fix fix as Eldy wish it 2013-04-20 00:10:20 +02:00
Maxime Kohlhaas
bfb05c78cd Change carrier config into dict instead of dedicated conf page 2013-04-19 20:20:10 +02:00
unknown
8030b39536 fix : undefined variable 2013-04-19 19:45:06 +02:00
Laurent Destailleur
eebbcbec57 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-19 19:18:39 +02:00
Laurent Destailleur
bb3f40a1bf Qual: Clean code to be able to update combo box when removing a box. 
Qual: Opensurvey tables
 2013-04-19 15:26:53 +02:00
Laurent Destailleur
08ae1d289b Pgsql compatibility 2013-04-19 15:02:53 +02:00
Laurent Destailleur
570e4391a5 Fix: Box with product out of stocks for pgsql 2013-04-19 14:51:39 +02:00
Regis Houssin
5d7b94f661 Fix: the purchase price, manually entered is not taken recovered 2013-04-19 13:30:08 +02:00