Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
83,873 Commits 36 Branches 189 Tags
41c18a78845e8b13b51e9c140c31e3567db6c5e7
Commit Graph

19506 Commits

Author SHA1 Message Date
ATM john
41c18a7884 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc 2020-02-24 00:01:50 +01:00
Laurent Destailleur
096a568e83 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2020-02-23 23:42:23 +01:00
stickler-ci
fab34d5114 Fixing style errors. 2020-02-23 22:40:41 +00:00
Laurent Destailleur
3075e40f8c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/remx.php
	htdocs/core/boxes/box_contacts.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/security.lib.php
 2020-02-23 23:37:46 +01:00
ATM john
0c2d08cdd9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc 2020-02-23 23:36:43 +01:00
Laurent Destailleur
5919570b34 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-23 23:31:51 +01:00
Laurent Destailleur
11ff3f6562 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-23 23:31:03 +01:00
Laurent Destailleur
ee45c3efb6 FIX #13184 2020-02-23 23:29:13 +01:00
ATM john
acacbfd85e Fix list separator on first loop 2020-02-23 23:17:10 +01:00
ATM john
316fa4068a revert commit fdfc45bbe9 and fix y position 2020-02-23 23:14:01 +01:00
ATM john
5ecef88b35 allow in extrafield conf to choose to add extrafield in a new col or append it to description, it could be useful for html or long text extrafields 2020-02-23 23:04:24 +01:00
Laurent Destailleur
ca39c680c7 Rename field documentpdf into printable (this field already exists due 
to a very old PR nofinished for same goal).
 2020-02-23 23:03:17 +01:00
Laurent Destailleur
90565e4637 Merge pull request #13179 from atm-john/12.0_new_allow_extrafields_on_pdf 
NEW allow display extrafields on pdf
 2020-02-23 22:55:16 +01:00
Laurent Destailleur
cac61c223d Merge pull request #13176 from andreubisquerra/master 
Add orders to Receipt Printer module
 2020-02-23 22:44:14 +01:00
Laurent Destailleur
189c0d675b Fix memory report. Xdebug no more required. Try = null instead of unset. 2020-02-23 22:05:59 +01:00
Laurent Destailleur
76e33058a8 NEW Can select several fields to personalize list before submit. 2020-02-23 21:38:24 +01:00
ATM john
93c9f07cb9 Fix note x position 2020-02-23 20:59:04 +01:00
ATM john
f611e4fc0e Merge branch '12.0_new_allow_extrafields_on_pdf' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf 2020-02-23 20:53:50 +01:00
ATM john
07bd6e1fc0 Fix On admin page add extrafields form, display on pdf option doesn't saved 2020-02-23 20:52:44 +01:00
stickler-ci
222a000d31 Fixing style errors. 2020-02-23 14:27:22 +00:00
ATM john
8a279ed124 improve extrafields display in notes 2020-02-23 15:24:59 +01:00
ATM john
679e2fd186 Merge branch '12.0_new_allow_extrafields_on_pdf' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf 2020-02-23 11:36:06 +01:00
ATM john
fe4e00b139 Add new params to extrafields forms to allow extrafields to be displayed on pdf documents 2020-02-23 11:32:38 +01:00
stickler-ci
d575188d80 Fixing style errors. 2020-02-23 09:11:58 +00:00
ATM john
ff6dc735ee fix extrafield conf cache 2020-02-23 10:09:47 +01:00
stickler-ci
281e059487 Fixing style errors. 2020-02-23 01:28:30 +00:00
ATM john
8c36dd0ad8 add extrafields in notes 2020-02-23 02:26:21 +01:00
ATM john
60b3d9d4db Add extrafields on PDF object lines for compatible pdf 2020-02-22 18:07:15 +01:00
stickler-ci
2b027cfebf Fixing style errors. 2020-02-22 15:45:39 +00:00
ATM john
e209fd2973 Add extrafields on PDF object lines 2020-02-22 16:27:44 +01:00
ATM john
aa77d96f23 remove IDE warnings 2020-02-22 12:06:21 +01:00
javierybar
fddcc844ff Add orders to Receipt Printers module 2020-02-22 11:30:48 +01:00
Laurent Destailleur
b4fdd9bc50 Merge pull request #13078 from hregis/10.0_mc 
FIX #10309
 2020-02-21 19:21:54 +01:00
Laurent Destailleur
e4b00c5c20 Merge branch 'develop' into master 2020-02-21 18:20:10 +01:00
Frédéric FRANCE
f6eba36575 fix CATEGORY_ADD_DESC_INTO_DOC 
$cate->add_category doesn't exists
 2020-02-21 18:00:12 +01:00
Laurent Destailleur
9b9f6d5da4 Merge pull request #13151 from frederic34/patch-6 
fix CATEGORY_ADD_DESC_INTO_DOC
 2020-02-21 17:55:19 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Laurent Destailleur
55bef402c4 Fix remove a lot of warnings on Eclipse 2020-02-21 17:47:36 +01:00
Laurent Destailleur
ec09e7222d Fix remove a lot of warnings on Eclipse 2020-02-21 17:31:37 +01:00
Laurent Destailleur
7e4af04886 CSS For bookmark dropdown 2020-02-21 17:18:01 +01:00
Laurent Destailleur
be3ecb3093 Remove hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless 2020-02-21 14:32:53 +01:00
Laurent Destailleur
7909055ee8 Enhance multilangue support in website module 2020-02-21 11:36:16 +01:00
Laurent Destailleur
1f4b639ba0 Debug MRP module 2020-02-20 17:44:03 +01:00
andreubisquerra
e316061a9a Fix travis 2020-02-20 16:26:30 +01:00
andreubisquerra
7a241ba042 Fix travis 2020-02-20 15:47:40 +01:00
Laurent Destailleur
c29e1e78f3 NEW Bookmarks are now in top menu bar 2020-02-20 15:43:31 +01:00
Laurent Destailleur
593091f399 FIX etrafield with visibilty=5 were not in read only 
FIX CSS
FIX option for topbar search and bookmarks

Conflicts:
	htdocs/theme/eldy/global.inc.php
 2020-02-20 15:29:59 +01:00
Laurent Destailleur
a3fce650d9 FIX etrafield with visibilty=5 were not in read only 
FIX CSS
FIX option for topbar search and bookmarks
 2020-02-20 15:25:32 +01:00
javierybar
2942e85e47 More elegant and easy to understand printer setup 2020-02-20 15:16:17 +01:00
Ferran Marcet
9ff424e23b FIX: Visualization rights correction on last modified contacts box 2020-02-20 11:45:46 +01:00