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

468 Commits

Author SHA1 Message Date
Laurent Destailleur
ec576c91cc Enhance prototype for tables 2013-10-21 13:43:31 +02:00
Regis Houssin
bc0f65b73c Fix: reorder lines problem 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2013-10-12 11:58:38 +02:00
Regis Houssin
8801d7a1eb Fix: reorder lines problem 2013-10-12 11:54:37 +02:00
Christophe Battarel
b197231c04 fix bad margin calculation for credit notes 2013-09-24 17:49:56 +02:00
Laurent Destailleur
491bd76c1b Work on openif authentication mode 2013-09-18 21:22:24 +02:00
Juanjo Menent
376b2812fe Merge pull request #1190 from altairis-fr/develop 
add ability to modify margin rate on line edit if authorized
 2013-08-23 00:18:08 -07:00
Christophe Battarel
4df216afbc add ability to define margin when adding line with new experimental form 2013-08-22 12:13:14 +02:00
Christophe Battarel
f37c24f8ff allow to modify margin rate or mark rate but not both 2013-08-22 11:45:27 +02:00
Christophe Battarel
e672783adb add ability to modify margin rate on line edit if authorized 2013-08-22 11:39:55 +02:00
Christophe Battarel
4c7741f5f0 manage user permissions for margin display 2013-08-20 12:11:19 +02:00
Christophe Battarel
06b8e939bd manage user permissions for margin rate 2013-08-20 12:04:01 +02:00
Christophe Battarel
29d329a1d2 ability to define margin rate on quotes, orders, invoices 
more to come : same on edit, user permissions
 2013-08-12 15:34:09 +02:00
Laurent Destailleur
75e2350e6a Fix: Mutualizing code fix bug into duplicate code of contact management 
for project.
 2013-07-30 19:08:58 +02:00
Laurent Destailleur
843478317e Qual: Reduce CSS size by mutualizings styles. 2013-07-27 18:21:35 +02:00
Laurent Destailleur
14dfbfc40c Fix: W3C (form into tr make some browsers crazy) 2013-07-27 13:29:06 +02:00
Laurent Destailleur
2f25e07e5a Add class for body into login page 2013-07-27 11:53:15 +02:00
Laurent Destailleur
c174be7100 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-07-10 22:59:39 +02:00
Laurent Destailleur
f690860aa8 Fix: Avoid duplicate div error. 2013-07-10 22:58:53 +02:00
Laurent Destailleur
2bc650bf61 Qual: Remove tons of codesniffer errors and warnings. 2013-07-07 13:14:32 +02:00
Laurent Destailleur
1d8b9949d6 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php
 2013-06-24 20:02:02 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
7fb8a740e7 Fix: bad function 2013-06-23 18:54:18 +02:00
Laurent Destailleur
b49a1168e3 Fix: Use div for tables when there is a different form on each line. 2013-06-23 18:33:03 +02:00
Laurent Destailleur
570275cd76 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/opensurvey.lang
	htdocs/opensurvey/public/index.php
 2013-06-21 15:37:17 +02:00
Laurent Destailleur
253ce19bc1 Fix: Bad position of field 2013-06-21 15:26:46 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Laurent Destailleur
3cd303c944 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2013-06-14 19:56:07 +02:00
Laurent Destailleur
b3ca9de399 Fix: Update select with list 2013-06-14 02:09:34 +02:00
Florian Henry
9f03074127 - New: [ task #926 ] Add extrafield feature on order lines 
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
 2013-06-10 16:05:41 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
e6c93424ce Qual: Normalized tabs 2013-05-29 15:41:59 +02:00
Laurent Destailleur
71e14df62f Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-05-20 17:37:08 +02:00
Laurent Destailleur
416cdd2f9c Merge pull request #956 from cbattarel/3.3 
fix bug : external users should not see costprice and margin infos
 2013-05-20 07:39:39 -07:00
fhenry
fefb21a56e Fix bug on Extrafield checkbox 
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
 2013-05-18 12:17:43 +02:00
simnandez
e2f2ad30ae Fix: Remove windows CR/LF 2013-05-18 09:15:18 +02:00
simnandez
2879a09a03 Fix: Remove windows CR/LF 2013-05-18 09:11:24 +02:00
Christophe Battarel
e3615d43bd fix bug : external users should not see costprice and margin infos 2013-05-17 15:02:27 +02:00
Laurent Destailleur
fdd8d2cc5e Fix: to large a href 2013-05-17 01:30:39 +02:00
Regis Houssin
047aa8ea29 Fix: avoid error when multiple files uploaded 2013-05-14 15:59:47 +02:00
Regis Houssin
d2aacdb04b Fix: avoid error when multiple files uploaded 2013-05-14 15:58:59 +02:00
Laurent Destailleur
03cbe6e208 Fix: Can't read link with some styles 2013-05-13 23:46:37 +02:00
Laurent Destailleur
fa4fc8495b Fix: Missing translation key 
Fix: Minor css style missing
Fix: Create draft proposal return error if no contact defined.
Fix: W3C
 2013-05-11 02:12:34 +02:00
fhenry
0dbc73a6cc Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d 2013-05-02 22:57:42 +02:00
Laurent Destailleur
9a4cc839bb Fix: Removed warning 
Fix: Parameters are lost
Fix: Hedaer of demo no complete
Fix: Get of country is not complete (bad label)
 2013-05-02 17:41:10 +02:00
Laurent Destailleur
26f3e920cf Fix: Removed warning. 
Fix: Missing doxygen
 2013-05-02 13:10:39 +02:00
Laurent Destailleur
7d71be2227 Fix: Import of contact/address not complete and not working with pgsql 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2013-04-30 22:56:52 +02:00
Laurent Destailleur
786bf9d035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-30 22:39:17 +02:00
Laurent Destailleur
8c064c4883 Fix: Import of contact/address not complete and not working with pgsql 2013-04-30 19:02:02 +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
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
fhenry
9a0f9477a6 Fix multicompany problem with extrafield list from table 2013-04-25 00:01:38 +02:00
fhenry
7b1616d0c5 Better management extrafield from list of table 2013-04-24 19:14:03 +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
Laurent Destailleur
e65e6516c5 Fix: Logon theme on amarok 2013-04-22 14:33:47 +02:00
fhenry
d6514e1cd6 Add extrafield select from table 2013-04-21 17:36:23 +02:00
Regis Houssin
077698d789 Fix: for avoid missing the customer discount 2013-04-19 12:47:53 +02:00
Laurent Destailleur
10ab1a583a Look: Optimize screens 2013-04-16 01:13:20 +02:00
Laurent Destailleur
1a1e09a5ed Qual: Clean and mutualize code. 2013-04-13 18:33:23 +02:00
Laurent Destailleur
ae01285fe9 Look: Replace table with div. 
Look: Optimize for smartphone
 2013-04-12 16:16:39 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
Laurent Destailleur
5f2ea4c65c Merge pull request #804 from atm-maxime/develop 
Fixes on invoice payment list and for price by quantity
 2013-04-05 13:49:52 -07:00
Laurent Destailleur
1fb3159045 Qual: Uniformize code 2013-04-05 18:09:05 +02:00
Laurent Destailleur
77050340df Fix: Do not loose value dol_use_jmobile when using not connected pages 
(support and forget password)
 2013-04-05 17:50:45 +02:00
Laurent Destailleur
58277b0fff Look: Replace table with div 2013-04-05 17:39:27 +02:00
Maxime Kohlhaas
9530e103e8 Fix : price by quantity now updates the discount field only if there is not an existing discount greater than the price by quantity one 2013-04-04 20:44:00 +02:00
Laurent Destailleur
545ac638b0 Qual: Removed deprecated code for using a specific mobile theme. 
New: Include terminal variables to optimize any themes.
Qual: First change to allow butAction buttons to wrap on new lines for
small size screens.
 2013-04-03 15:20:56 +02:00
fhenry
735e107a51 Better error management on extrafailed input 2013-04-02 14:12:21 +02:00
fhenry
893fed9284 [ task #783 ] Add checkbox and radio into extrafield feature 2013-04-02 11:56:53 +02:00
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +01:00
jfefe
b36b776f10 IKM : work on new extrafield separator type 2013-03-15 23:39:18 +01:00
jfefe
b1d50e3f7f Move extrafield type select list on top of form 2013-03-15 18:56:44 +01:00
Laurent Destailleur
e748f07806 Qual: Using divs instead of tables 2013-02-25 10:31:47 +01:00
Laurent Destailleur
234e171e9d New: Add option dol_hide_topmenu and dol_hide_leftmenu onto login page. 2013-02-24 18:16:26 +01:00
Laurent Destailleur
3baf8a6c00 New: Use div instead of tables into login page. 2013-02-24 14:57:49 +01:00
Laurent Destailleur
c62f87380c Qual: use div instead of table 2013-02-24 02:41:46 +01:00
Regis Houssin
20522148f2 Fix: regression, the product discount overwrites the default customer 
discount !
 2013-02-22 11:06:45 +01:00
Regis Houssin
289ff4fe1a Fix: regression, the product discount overwrites the default customer 
discount !
 2013-02-22 11:03:20 +01:00
jfefe
3d8197ce4b Work on extrafields : position management & new type : select list 2013-02-15 11:19:49 +01:00
jfefe
14f21bc9f1 Add select list in extrafields type 2013-02-15 00:17:42 +01:00
Laurent Destailleur
82dda5723b Fix: Disable autocomplete 2013-02-12 01:29:26 +01:00
Laurent Destailleur
8682d3c928 Fix: Note not visible 2013-01-24 12:16:00 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
fhenry
51098c1227 Add standard extrafield type : 
- mail
	- phone
	- price
 2013-01-14 16:13:09 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-01-13 19:33:54 +01:00
fhenry
d39368fd36 Add boolean (checkbox) standard extrafield feature 2013-01-12 14:02:39 +01:00
Christophe Battarel
62ccb57857 fix missing td 2013-01-11 15:41:47 +01:00
Christophe Battarel
49703240f7 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:39:11 +01:00
Christophe Battarel
38e9290729 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:33:34 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Laurent Destailleur
9d47b812b9 New: Support module_parts['theme'] 2013-01-08 15:21:56 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Laurent Destailleur
012ee020a4 Fix: Bad label 2012-12-28 15:48:20 +01:00
Laurent Destailleur
8436f0666d Fix: [ bug #252 ] Contrat : pas d'éditeur WYSIWYG 
Fix: Margins information must be visible for orders, proposals and
invoices only.
Fix: Delete button for contracts not visible
 2012-12-28 11:36:31 +01:00
Laurent Destailleur
3858085a7f Add option MAIN_HELPCENTER_LINKTOUSE to define target link "I need help" 
onto logon page.
 2012-12-06 17:59:37 +01:00
Maxime Kohlhaas
e45438994c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-12-01 14:36:51 +01:00
Laurent Destailleur
4480af348c Fix: Cols at wrong place 2012-11-26 11:57:20 +01:00
Laurent Destailleur
b4ebd7e852 Qual: Uniformize code and fix a regression 2012-11-26 11:36:45 +01:00
Maxime Kohlhaas
9e4cba13c8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-11-22 15:24:10 +01:00
Regis Houssin
a3d9b5788c Fix: use keyup instead change to avoid loosing the product id 
Fix: strict mode
 2012-11-20 12:09:52 +01:00
Maxime Kohlhaas
ec37a5e005 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-11-19 13:31:23 +01:00
Laurent Destailleur
19b7cc66d5 Qual: Remove hidden option so is not efficient and not used files. 
Qual: Uniformize code
 2012-11-17 11:48:51 +01:00
Maxime Kohlhaas
bed17951b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 2012-10-27 15:59:40 +02:00
Maxime Kohlhaas
0f1617c31d Task 559 : add use of price by qty in product selection (select and ajax search) 2012-10-26 01:00:03 +02:00
Laurent Destailleur
cbff238cbd New: Support property "required" for extra fields. 2012-10-25 16:23:58 +02:00
Regis Houssin
4f45ba8ff6 Fix: remove br 2012-10-24 09:56:31 +02:00
Laurent Destailleur
9589b84a1a Fix: No reason to start content of a cell with br 2012-10-22 19:30:49 +02:00
Regis Houssin
9bbea4f385 Fix: use span is better 2012-10-22 17:06:27 +02:00
Regis Houssin
446a81b4c4 Fix: move class in template 2012-10-18 10:35:55 +02:00
Laurent Destailleur
215d7a883e Fix: Revert bugged new feature that show false information. 2012-10-06 23:13:46 +02:00
Maxime Kohlhaas
16f82216bf Task # 186 : Add stock column in sql request to get object lines + display alert icon if stock is too low 2012-10-04 16:26:33 +02:00
Regis Houssin
1919604089 Fix: more compatible with multicompany transverse mode 
Fix: strict mode bubbles
 2012-09-27 11:57:46 +02:00
Laurent Destailleur
9bbe0e6b1c Qual: Mutuamize codeby using tpl. 
New: Support unique field for extrafields
 2012-09-22 20:27:06 +02:00
Regis Houssin
98b38628c5 Fix: optimizing 2012-09-19 17:24:40 +02:00
Laurent Destailleur
8b7342f0ea New: Project notes use the note.tpl templates 2012-09-19 16:03:17 +02:00
Laurent Destailleur
9bc0011290 Merge pull request #405 from cbattarel/develop 
correct some ajax bugs caused by tpl recent updates
 2012-09-19 05:53:29 -07:00
Christophe Battarel
de93c819f4 correct some ajax bugs caused by tpl recent updates 2012-09-19 12:02:06 +02:00
Regis Houssin
16ad953d10 Fix: best practice 2012-09-17 08:13:29 +02:00
Regis Houssin
bf008c7640 Fix: optimizing 2012-09-17 06:43:58 +02:00
Laurent Destailleur
3953be53a7 Qual: Mutualize code 
New: Can use extrafields on contacts/addresses.
 2012-09-17 01:39:30 +02:00
Laurent Destailleur
d48f294531 New: [ task #289 ] Reorder tasks 2012-09-15 15:33:00 +02:00
Laurent Destailleur
9147911ae4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2012-09-15 13:53:19 +02:00
Laurent Destailleur
4566595d44 Fix: W3C when module margin is on 2012-09-15 13:44:40 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
d2e336ddd6 Fix: GET and POST treatment in dol_loginfunction() 2012-09-08 15:16:27 +02:00
Laurent Destailleur
5641a451d5 Revert "Fix: GETPOST is already in method" 
This reverts commit ce26a3cc81.
 2012-09-08 13:33:48 +02:00
Regis Houssin
ce26a3cc81 Fix: GETPOST is already in method 2012-09-08 13:24:10 +02:00
Laurent Destailleur
00ceaf9fac Sec: XSS hole 2012-09-08 13:19:54 +02:00
Laurent Destailleur
d0528740c2 Fix: We must not show date range for a product line type (only 
service line)
 2012-09-08 01:02:54 +02:00
Laurent Destailleur
7c27cfa88e Fix: br at wrong place (a different fix that should be ok in all cases) 2012-09-08 00:58:14 +02:00
Regis Houssin
c98e456ba9 Fix: missing <br> and strict mode 2012-09-07 18:16:05 +02:00
Regis Houssin
ee1cf819f7 Fix: mass convert line delimiters 2012-09-07 17:23:16 +02:00
Regis Houssin
928aae7f79 Fix: strict mode day 2012-09-07 11:40:59 +02:00
Laurent Destailleur
eb3a262289 Fix: br at wrong place 2012-09-07 10:03:25 +02:00
Regis Houssin
ac5e201829 Fix: compatibility between bureau2crea theme and multicompany module 2012-09-02 11:40:20 +02:00
Regis Houssin
63564f8d50 Fix: broken features 2012-09-02 09:27:06 +02:00
Regis Houssin
c9886fb86d Fix: same size of view lines 2012-08-31 16:50:46 +02:00
Regis Houssin
f81b696890 Fix: code optimization 2012-08-31 09:25:27 +02:00
Marcos García
bb99e4d40d Fixed a problem when adding line into proposal 2012-08-31 07:49:00 +02:00
Regis Houssin
9a6ddbe096 Fix: use $mysoc instead customer 2012-08-30 22:14:18 +02:00
Regis Houssin
e84f57e62c Fix: restore broken features 2012-08-30 21:37:37 +02:00
Laurent Destailleur
c7e7b67433 Fix: bad default vat calculation 2012-08-30 21:16:41 +02:00
Regis Houssin
8f21abfc5a Fix: Disabled if customer is not subject to VAT 2012-08-30 19:01:48 +02:00
Regis Houssin
88742e41d4 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-30 11:10:53 +02:00
Regis Houssin
95c2650160 Fix: best method 2012-08-30 11:10:17 +02:00
Laurent Destailleur
bd5acde0c7 Add tag to detect new method (to help debugs) 2012-08-29 19:03:58 +02:00
Regis Houssin
ffd6c07003 Fix: remove obsolete code 2012-08-29 18:14:20 +02:00