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

371 Commits

Author SHA1 Message Date
fhenry
d03fb5d363 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-02 10:53:29 +02:00
fhenry
489d62dbf1 Better extrafield date management 2013-04-02 10:52:39 +02:00
jfefe
cf6f4405cb Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 
Conflicts:
	htdocs/comm/propal.php
 2013-04-01 19:44:55 +02:00
jfefe
ec52f54a52 Unique function to show input or output of extrafields datas 2013-04-01 18:59:05 +02:00
jfefe
1ab1d74c77 New option (MAIN_EXTRAFIELDS_USE_TWO_COLUMS) to split extrafields display into 2 columns 2013-03-30 17:52:59 +01:00
jfefe
3fe1b26136 New method to CommonObject to display extrafields data output 
Try for product
 2013-03-30 17:43:21 +01:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
jfefe
80f080f5a9 Format date for sql query 
Using dol_print_date because db->idate doesn't work
 2013-03-29 14:45:40 +01:00
eldy
90025f9c13 Work on revenue stamp 2013-03-23 13:07:25 +01:00
eldy
3af7ca5ac8 Work on revenue stamp feature. 2013-03-23 12:23:09 +01:00
Regis Houssin
34bfdb1846 Fix: broken feature if the table has no field fk_parent_line 2013-03-22 19:21:46 +01:00
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +01:00
jfefe
ba0963ea7d Fix : implement separator extrafield - missing check on update 2013-03-16 00:00:57 +01:00
Laurent Destailleur
5bc66318c2 New: use dolGetFirstLastname() everywher we should. 2013-03-11 15:54:01 +01:00
Laurent Destailleur
746e005726 Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
Laurent Destailleur
215731dc59 Fix bug 2013-03-05 00:14:04 +01:00
Laurent Destailleur
51d23d7c48 Merge fix of 3.3 2013-03-02 16:17:12 +01:00
Regis Houssin
16ad99f8c5 Fix: to force id field name 2013-02-28 19:41:44 +01:00
Grand Philippe
ac0e99bc1a english language standardization 2013-02-23 16:21:49 +01:00
Grand Philippe
ab2b06117b fix trad : change adresse versus address 2013-02-15 19:56:51 +01:00
Grand Philippe
7c1a4e6fdf fix trad to get better understanding 2013-02-15 15:48:53 +01:00
Regis Houssin
fcee35c65d Fix: $hookmanager is a global object 2013-01-26 10:35:30 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Laurent Destailleur
d2152a8342 Restore correct code: A module decide if standard code is used or not 
after running by a return code that is an int 
0=execute standard code, 1=disable standard code

To return a string to show or an array or error codes, this must be done
by setting
$actionclassinstance->results
or
$actionclassinstance->resprints
 2013-01-22 18:15:51 +01:00
Laurent Destailleur
b0c1137397 Restore correct code: A module decide if standard code is used or not 
after running by a return code that is an int 
0=execute standard code, 1=disable standard code

To return a string to show or an array or error codes, this must be done
by setting
$actionclassinstance->results
or
$actionclassinstance->resprints
 2013-01-22 17:43:41 +01:00
Regis Houssin
910543c5b9 Fix: broken feature 2013-01-22 16:53:39 +01:00
Regis Houssin
f0361b9c4c Fix: broken feature 2013-01-22 16:51:10 +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
Christophe Battarel
38e9290729 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:33:34 +01:00
Laurent Destailleur
03b906808e Merge pull request #593 from marcosgdf/eu-vat 
Updated EU VAT area links and added Isle of Man
 2013-01-10 12:12:25 -08:00
Marcos García
8e7a66a544 Fixed indentation problem 2013-01-10 14:20:03 +01:00
Marcos García
809367d23b Updated EU VAT area links and added Isle of Man 
Isle of Man is in included in UK state as shown in http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9
 2013-01-10 14:17:43 +01:00
Marcos García
593db37423 Function getTotalDiscount of commonobject.class.php should always return a float for precission 2013-01-10 13:53:46 +01:00
Laurent Destailleur
8ac33e98e7 Fix: property object_total_discount was not working when quantity was 
not 1.
 2013-01-10 12:58:46 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
78a1354a52 Fix: Solve phpunit regression. 
Include an option to support local tax of type 7 (need more time to
validate this type).
 2012-12-19 18:51:49 +01:00
Laurent Destailleur
f4459ee1f1 Fix: Regression detected by PHPUnit 2012-12-10 19:06:59 +01:00
fhenry
99f01f1dca [Task 632] : Add standard extra field feature for Agenda 2012-12-08 12:49:20 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Christophe Battarel
46089bb03c also update ttc with global local taxes 2012-11-27 15:43:52 +01:00
Christophe Battarel
e87bb02323 retrieve global local taxes in update_price function 2012-11-27 15:34:46 +01:00
Marcos García
c9944a6b9b Created function to retrieve total discounted amount of a commonobject 
Also added an ODT tag to let people add it to their invoices, etc..
 2012-10-15 00:49:39 +02:00
Laurent Destailleur
d48f294531 New: [ task #289 ] Reorder tasks 2012-09-15 15:33:00 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
28e5ba6c18 Fix: mini strict mode 2012-09-12 18:47:06 +02:00
Christophe Battarel
c1859d361a modify margin management for global discount + correct bug (wrong constant name) 2012-08-28 10:13:58 +02:00
Regis Houssin
3e2be54ead Fix: restore old method 2012-08-27 19:11:44 +02:00
Regis Houssin
07a10d3984 Fix: add compatibility with old static combobox 2012-08-27 17:18:46 +02:00
Regis Houssin
f322ec50ed New: [ task #498 ] - final part 2012-08-25 15:21:34 +02:00
Regis Houssin
d88abe8df0 Fix: use label instead libelle 2012-08-25 12:07:18 +02:00
Regis Houssin
c9113458d9 New: [ task #498 ] part 3 2012-08-25 03:28:30 +02:00
Regis Houssin
995c7f13d3 New: [ task #498 ] part3 2012-08-23 13:45:51 +02:00
Regis Houssin
f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
 2012-08-23 07:53:48 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +02:00
Laurent Destailleur
6cf97a7317 Clean dead code 2012-08-03 14:18:48 +02:00
Regis Houssin
2e73cd7ddf Fix: missing fields and compatibility with milestone 2012-08-01 17:38:10 +02:00
Regis Houssin
7d2f7e9800 Fix: strict mode crazy 2012-07-25 11:46:33 +02:00
Regis Houssin
c6cd17cf3f Fix: strict mode... far away 2012-07-24 17:52:46 +02:00
Regis Houssin
d5ff308992 Fix: declare $mesg and $mesgs in main.inc.php 
Fix: strict mode be back
 2012-07-23 20:52:55 +02:00
Regis Houssin
fafd79a0f8 Fix: uniformize code (in progress) 2012-07-20 09:57:50 +02:00
Christophe Battarel
3844a77395 correct typing bugs 2012-07-18 16:06:36 +02:00
Christophe Battarel
316f6ce09c add margin infos to commonobject.class.php 2012-07-18 15:26:33 +02:00
Laurent Destailleur
1831b46bae Fix: Do not show if module disabled 2012-07-17 14:30:10 +02:00
Regis Houssin
e1b0d183e4 Fix: add commonorder and commoninvoice classes 2012-07-11 18:13:41 +02:00
Regis Houssin
ff0668e908 Fix: strict mode way 2012-07-10 22:10:12 +02:00
Regis Houssin
cd7bf41ae0 Fix: php 5.4 strict mode warning 2012-07-09 10:08:56 +02:00
Regis Houssin
2804ef2252 New: classify billed order if invoice billed (workflow 
manager)
 2012-07-08 14:18:40 +02:00
Regis Houssin
680fd32d23 Fix: missing parameters 2012-07-08 12:24:13 +02:00
Regis Houssin
69ebda8ddb Fix: regression corrected 2012-07-08 12:18:29 +02:00
Regis Houssin
83a228265c New: add possibility to use hooks for view linked objects block 2012-07-05 15:02:11 +02:00
Regis Houssin
d593878c78 Fix: big problem with linked elements 2012-07-02 17:07:37 +02:00
Laurent Destailleur
787f423448 Fix: Removed warning. Fix compatibility. 2012-06-26 23:11:46 +02:00
Regis Houssin
b5246add8d Fix: big problem with files upload and more compatible with external 
modules
 2012-05-30 00:07:06 +02:00
Laurent Destailleur
c6c9861bff Fix: bug on projects visibility for external users 2012-05-23 13:09:36 +02:00
Laurent Destailleur
d2672c4b39 Fix: setStatut works for user class 2012-05-05 20:22:46 +02:00
Laurent Destailleur
7bbacaece7 Fix: missing global 2012-05-01 14:09:58 +02:00
Laurent Destailleur
96a90e2e7a Fix: Overwritting code is not role of a template but of a module. 
Code is now working as a module change. Also it is faster (no need to
make a failed include when module is not installed) and support
alternative directory.
 2012-04-29 11:00:28 +02:00
Grand Philippe
922703879f to use specific tpl within his own theme 2012-04-28 18:24:52 +02:00
Laurent Destailleur
9df05381d1 Fix: Bug war. 
Look: enhance look for map views.
 2012-04-08 13:05:58 +02:00
Laurent Destailleur
317abb46fd Fix: Start war bug 2012-04-07 02:24:32 +02:00
Regis Houssin
94788e2ccb Fix: compatibility with multicompany sharings 
use new $conf->product->dir_output[$object->entity] instead
$conf->product->dir_output
 2012-04-06 22:41:33 +02:00
Regis Houssin
a344f079d6 Fix: backward compatibility 2012-04-06 16:46:19 +02:00
Regis Houssin
1c2f192dd6 Fix: add customer_ref in propal list and clean code 2012-04-06 11:38:13 +02:00
Regis Houssin
cf7170c14d Fix: set to null if empty 2012-03-24 22:18:11 +08:00
Laurent Destailleur
3383d314c9 Doxygen 2012-03-19 17:18:11 +01:00
Regis Houssin
99ab46510b Fix: remove private status for external modules 2012-03-18 20:23:50 +01:00
Regis Houssin
4ecc64504d Fix: use the original json functions 2012-03-18 19:59:38 +01:00
Laurent Destailleur
7c4ef2fbf7 Qual: Move some class as private 2012-03-18 17:47:17 +01:00
Laurent Destailleur
59bef9caa1 Qual: Uniformize code to use new note system. 2012-03-18 02:01:23 +01:00
Laurent Destailleur
a7a55645d8 Fix: Some fix when using fckeditor with notes. 
Qual: Uniformize code to use new system for notes.
Qual: Removed duplicate updatenote method into commandefournisseur
class.
 2012-03-18 00:59:24 +01:00
Regis Houssin
60a6c3fa95 Fix: missing fetch for get extraparams 2012-03-16 19:16:17 +01:00
Regis Houssin
391ce8490f New: add "extraparams" field for stock extra parameters with json 2012-03-16 14:32:37 +01:00
Regis Houssin
942b1f2a19 Fix: status not updated after reopen 2012-03-15 06:59:27 +01:00
Regis Houssin
5fbd8e4cee Fix: move method in common class 2012-03-14 11:11:46 +01:00
Regis Houssin
f8bf7ade83 Fix: move method in common class 2012-03-13 20:01:10 +01:00
Regis Houssin
9831a2028c Fix: missing variable 2012-03-13 19:36:00 +01:00