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

3041 Commits

Author SHA1 Message Date
Laurent Destailleur
ecbe719f23 FIX Several problems into shipment management with lot enabled 2016-11-14 13:40:41 +01:00
Laurent Destailleur
cc70b51ba3 Fix missing warning 2016-11-14 02:25:59 +01:00
Laurent Destailleur
a369514e46 Tooltip help better 2016-11-13 20:43:34 +01:00
Laurent Destailleur
6014345fb7 Fix typo error 2016-11-13 18:28:06 +01:00
Laurent Destailleur
4bcc7dc8a0 CLOSE #4368 #4369 Add hook completeTabsHead for rewrite heads tabs menu 2016-11-12 14:36:52 +01:00
aspangaro
e13e66ce7b Update works 2016-11-12 07:40:08 +01:00
aspangaro
137561aec9 Merge remote-tracking branch 'Upstream/develop' into 5.0-p35 2016-11-12 06:31:06 +01:00
Laurent Destailleur
b1bd9e4930 Responsive design 2016-11-11 23:17:37 +01:00
Laurent Destailleur
7ccc70e00d Fix as suggested for #5960 2016-11-11 15:29:48 +01:00
Laurent Destailleur
071ba4fbfd Fix as suggested for #5960 2016-11-11 15:27:29 +01:00
Laurent Destailleur
cd9f1db229 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
 2016-11-11 15:12:30 +01:00
Laurent Destailleur
a605e0b972 Fix phpcs 2016-11-11 15:06:31 +01:00
Laurent Destailleur
fd1c0f404c Merge pull request #5864 from hregis/4.0_bug 
Fix: add possibility to change width type to prevent some display issues
 2016-11-11 14:55:28 +01:00
Laurent Destailleur
9606f67bdb Better responsive design 2016-11-10 14:57:50 +01:00
Laurent Destailleur
cc64994f30 Better responsive design 2016-11-10 11:33:25 +01:00
Laurent Destailleur
9bff6f966b NEW Can add event from the card listing events 2016-11-08 14:08:48 +01:00
Laurent Destailleur
7a94cfc994 NEW Better filtering of automatic/manually inserted events. 2016-11-08 13:03:20 +01:00
Laurent Destailleur
341e014a3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/document.php
 2016-11-08 11:36:31 +01:00
Laurent Destailleur
bb5df3beeb Fix missing tab 2016-11-07 04:02:16 +01:00
Laurent Destailleur
90881f2fa9 FIX Sanitize title of ajax_dialog 2016-11-07 00:15:58 +01:00
Laurent Destailleur
4681c84e1d Better responsive 2016-11-06 12:16:10 +01:00
aspangaro
5ed79800e0 Begin to wok on Vat expense report integration in reports 2016-11-05 07:48:42 +01:00
Laurent Destailleur
0fea6f22a9 Change code to reduce need of jmobile 2016-11-05 03:27:56 +01:00
Laurent Destailleur
e59c2bb61c Debug accounting menu. Can now edit product account if already set. 2016-11-04 16:15:31 +01:00
Laurent Destailleur
a658b7cc3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/card.php
 2016-10-31 21:31:57 +01:00
Laurent Destailleur
3882fa0c3d Fix dol_buildpath with parameter 3. Add phpunit tests 2016-10-31 10:37:58 +01:00
Laurent Destailleur
1382858f75 Fix log 2016-10-30 17:42:34 +01:00
Laurent Destailleur
3fbba59f69 Better management of status of events 2016-10-30 13:12:35 +01:00
Laurent Destailleur
e9edbba093 NEW Usage of vat code seems ok everywhere. 2016-10-29 21:02:08 +02:00
Laurent Destailleur
658e30aa2f Close #4685 2016-10-29 18:09:57 +02:00
Laurent Destailleur
32b6660f63 Uniformize code 2016-10-29 16:18:39 +02:00
Laurent Destailleur
22d2557a48 Clean page 2016-10-28 18:05:46 +02:00
Laurent Destailleur
220d81b350 Fix duplicate tooltips 2016-10-28 17:43:29 +02:00
Laurent Destailleur
fb0f5e3230 Better behaviour on small screen 2016-10-27 01:47:03 +02:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Laurent Destailleur
aad4380689 Uniformise code 2016-10-24 20:52:21 +02:00
Laurent Destailleur
36c2b5afcd Responsive 2016-10-24 18:43:17 +02:00
Laurent Destailleur
bc2342e9a4 Fix bad link 2016-10-24 17:37:39 +02:00
Laurent Destailleur
3b05d00163 Better responsive design 2016-10-24 12:06:33 +02:00
Laurent Destailleur
9560ec54cc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/facture/list.php
 2016-10-24 02:15:12 +02:00
Laurent Destailleur
acf8874c6a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2016-10-24 02:11:49 +02:00
Laurent Destailleur
a6c2758ca2 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2016-10-24 02:10:17 +02:00
Laurent Destailleur
fdcc858008 Merge branch 'dev_resource_extrafields' of 
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 02:05:34 +02:00
Laurent Destailleur
14e78ef50b Mutualize code of 2 lists into one page. 2016-10-22 13:52:43 +02:00
Laurent Destailleur
3ca3b7ab78 Fix code comment 2016-10-21 10:36:11 +02:00
florian HENRY
5bf03de3fb Fix setup page 2016-10-19 22:24:04 +02:00
florian HENRY
54a154fa4f NEW : Add ressource extrafields 2016-10-19 22:14:51 +02:00
Laurent Destailleur
19532c9965 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
 2016-10-18 13:00:46 +02:00
Laurent Destailleur
dada679110 Uniformise code 2016-10-18 12:16:12 +02:00
Juanjo Menent
f28c7bbc6d Fix: Bad localtaxes calc for Spain if VAT is 0. For >= 3.9.x 2016-10-18 10:20:09 +02:00
Juanjo Menent
6a944bb6a3 Fix: Bad localtaxes calc for Spain if VAT is 0 2016-10-18 10:11:42 +02:00
Laurent Destailleur
c1bf7c52f4 Add a line of filter in list of events related to thirdparty or projects 2016-10-18 00:02:18 +02:00
Laurent Destailleur
434b3ef643 Uniformize code and look and feel 2016-10-17 17:52:58 +02:00
Laurent Destailleur
46c985d8cc FIX Hidden option PRODUCT_MAX_VISIBLE_PHOTO 2016-10-17 15:16:21 +02:00
Laurent Destailleur
fe471c43d1 Minor css enhancement 2016-10-16 18:28:09 +02:00
Laurent Destailleur
9175ff80a0 Fix download of files uploaded on donation 2016-10-16 17:25:33 +02:00
Laurent Destailleur
c4929c76f2 Merge pull request #5859 from GPCsolutions/5858 
Fix module activation errors
 2016-10-15 02:20:49 +02:00
Laurent Destailleur
1f6ddb485f Fix missing module supplier proposal for external users 2016-10-14 18:22:07 +02:00
Laurent Destailleur
79d376ee12 Debug accountancy module 2016-10-14 13:05:01 +02:00
Laurent Destailleur
7c1b74133a Debug accountancy module 2016-10-13 22:29:49 +02:00
Regis Houssin
6423b23fb3 Fix: use parameter instead constant 2016-10-12 15:36:51 +02:00
Regis Houssin
d848e98759 Fix: add possibility to change width type to prevent some display issues 2016-10-12 15:33:33 +02:00
Raphaël Doursenaud
46af0eed63
Fix module activation errors 
Closes #5858
 2016-10-11 10:24:10 +02:00
Laurent Destailleur
7504af42de Fix regression in GETPOST when value is an array 2016-10-10 00:56:35 +02:00
Laurent Destailleur
747123621c Fix better log 2016-10-10 00:53:54 +02:00
Laurent Destailleur
8cb38caca1 Fix regression in getUrl 2016-10-10 00:53:15 +02:00
Laurent Destailleur
0803084cc4 NEW The getURLContent return more information on success and error 2016-10-09 20:13:27 +02:00
Laurent Destailleur
cd9654978b NEW Filters can accept generic search key like __DAY__, __MONTH__, 
__YEAR__ replaced with current day, month year before making the search.
 2016-10-09 19:49:09 +02:00
Laurent Destailleur
ba52eb870c Enhancement of Oauth module 2016-10-07 18:43:44 +02:00
Laurent Destailleur
28e4c17730 Debug module accountancy expert 2016-10-06 19:59:33 +02:00
Laurent Destailleur
0cfb0ff7b7 Complete help 2016-10-06 19:03:40 +02:00
Laurent Destailleur
db3e3642b0 NEW Can generate SEPA mandate for each bank account of your customers 2016-10-06 00:14:25 +02:00
Laurent Destailleur
46f2f154c2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-04 19:47:45 +02:00
Laurent Destailleur
3599f2c840 Uniformize code for recurring invoices 2016-10-04 12:31:45 +02:00
Laurent Destailleur
45a808e034 NEW Generation of document is available on member card 2016-10-03 00:08:47 +02:00
Laurent Destailleur
9fbe96dd38 Fix name of agenda tab 2016-10-02 21:31:32 +02:00
Laurent Destailleur
f92ca518f7 Uniformize look and feel 2016-10-02 16:38:58 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
521008a698 FIX #5746 chrome php 
Try a fix. Not sure it solved all problems reported
 2016-10-01 17:27:52 +02:00
Laurent Destailleur
91a9cb4178 Fix solution to avoid the .noexe 2016-10-01 14:02:24 +02:00
Laurent Destailleur
20ad359c9b FIX Warning to grant permission must be visible only if one module add 
some permissions
 2016-09-30 18:26:32 +02:00
Laurent Destailleur
287f9972a8 Merge branch 'new_no_default_rights' of 
https://github.com/atm-maxime/dolibarr into
atm-maxime-new_no_default_rights

Conflicts:
	htdocs/langs/en_US/admin.lang
 2016-09-30 13:04:14 +02:00
Laurent Destailleur
2b8255590a Better error message 2016-09-29 13:55:46 +02:00
Laurent Destailleur
6232e59fd2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-26 14:17:36 +02:00
Laurent Destailleur
e60d2b0ae5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2016-09-26 14:10:39 +02:00
Laurent Destailleur
100312aac2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/adherents/class/cotisation.class.php
 2016-09-26 01:32:50 +02:00
Laurent Destailleur
ea09eb13da Uniformize code 2016-09-26 00:10:29 +02:00
Laurent Destailleur
4cccaae831 Fix warning 2016-09-25 16:44:55 +02:00
aspangaro
2dbeeedd14 Move tab menu for subscription in member.lib 
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
 2016-09-24 06:48:40 +02:00
Laurent Destailleur
dc45776d31 FIX Date visible on project overview 2016-09-23 10:32:19 +02:00
Laurent Destailleur
133657a8c7 Uniformize code 2016-09-21 01:25:34 +02:00
Laurent Destailleur
79ddc2458d Better center of left, center and right part of titles. 2016-09-20 12:51:09 +02:00
Laurent Destailleur
af28a67803 Uniformize look using dol_banner 2016-09-19 10:43:30 +02:00
Laurent Destailleur
77e2037195 NEW Add REST API to read, create and delete agenda events 2016-09-19 02:02:45 +02:00
Laurent Destailleur
c8b8e13014 Work on dol_banner for proposals. 2016-09-18 21:38:20 +02:00
Laurent Destailleur
5ea9fc7467 NEW Support extrafields on product lot. 2016-09-12 17:27:44 +02:00
Laurent Destailleur
cad69c9e90 Fix phpcs 2016-09-11 13:38:15 +02:00
Laurent Destailleur
e90909051e Merge pull request #5718 from atm-alexis/NEW_filter_type_action_thirdparty_event_tab 
NEW filter on action type on thirdparty event tab
 2016-09-11 13:34:08 +02:00
Laurent Destailleur
f8dbc1aa9f Theme cleaner 2016-09-10 16:09:01 +02:00
Laurent Destailleur
858291c3a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-09 09:32:51 +02:00
Laurent Destailleur
0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
 2016-09-09 09:32:14 +02:00
Laurent Destailleur
2b7ef01e42 FIX SEC for HTB23302 2016-09-08 11:09:38 +02:00
Alexis Algoud
74d495c192 NEW filter actiontype on thirdparty tab 2016-09-08 10:26:38 +02:00
phf
d3a7b5453b New type for GETPOST 2016-09-08 10:25:48 +02:00
Laurent Destailleur
898bbd6031 NEW Support extrafields for expense reports 2016-09-06 13:00:32 +02:00
Laurent Destailleur
d24045d831 NEW Editing translation GUI become easier with search translation tool. 2016-09-04 14:45:43 +02:00
Laurent Destailleur
e4539be127 FIX sortfield and sortorder parameters output twice in navigation url. 2016-09-04 13:28:37 +02:00
Laurent Destailleur
cb27b01812 Work on feature to find a translation key 2016-09-03 18:47:04 +02:00
Laurent Destailleur
13746a3c03 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 22:37:59 +02:00
Laurent Destailleur
aab3b2837a FIX #5589 2016-09-02 22:34:37 +02:00
Laurent Destailleur
eee53998ad Mark function as deprecated #5577 2016-09-02 22:14:15 +02:00
Laurent Destailleur
3e84d227b3 Remove not used function calculate_byte. Use dol_print_size instead. 2016-08-31 19:57:17 +02:00
Laurent Destailleur
07e6c156a3 Fix free to reachable 2016-08-31 19:48:15 +02:00
Juanjo Menent
90c670a89e Merge pull request #5684 from aspangaro/5.0-p9 
Uniformize presentation on suppliers invoices
 2016-08-31 10:08:57 +02:00
aspangaro
688ac691a9 Uniformize presentation on suppliers invoices 2016-08-31 07:05:23 +02:00
aspangaro
3892f295c7 Uniformize presentation of customer's invoice 2016-08-31 06:27:35 +02:00
Juanjo Menent
612db4f66d Merge pull request #5673 from aspangaro/5.0-p5 
Fix: Presentation on member card
 2016-08-31 02:09:28 +02:00
Juanjo Menent
8155c09d49 Merge pull request #5671 from aspangaro/5.0-p3 
Fix: Presentation on financial account
 2016-08-31 02:08:33 +02:00
aspangaro
e2a92f304d Presentation on member card 2016-08-29 22:07:21 +02:00
aspangaro
358bcee3a5 Presentation on financiel account 2016-08-29 21:49:34 +02:00
Laurent Destailleur
d6d474f10d Clean code for category management. 2016-08-29 21:31:27 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
Laurent Destailleur
0d992b2b99 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/cron/class/cronjob.class.php
	htdocs/install/pgsql/functions/functions.sql
 2016-08-28 02:17:04 +02:00
Laurent Destailleur
bc8e203019 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-08-28 01:58:43 +02:00
Laurent Destailleur
5d7414dcc3 Solve php regression failing travis 2016-08-28 01:58:11 +02:00
Laurent Destailleur
8f809e403d Uniformize code 2016-08-24 19:38:34 +02:00
Laurent Destailleur
03c30c487c Uniformise code 2016-08-22 13:46:38 +02:00
Laurent Destailleur
0839a9fa4f Code comment 2016-08-20 00:54:49 +02:00
Marcos García de La Fuente
7e0b99d5ab Little changes to PHPDoc comment block 2016-08-11 15:23:00 +02:00
Laurent Destailleur
3f87b0c225 NEW Show photo of contacts on thirdparty card. 2016-08-06 00:04:24 +02:00
Laurent Destailleur
034b08ce56 NEW Add option "Hide images in Top menu". 2016-08-05 23:40:00 +02:00
Laurent Destailleur
890e6f59c8 NEW Support mass actions for proposals 2016-08-05 13:08:23 +02:00
Laurent Destailleur
e168888c59 NEW Reduce nb of picto on ref into list, merging preview and download 2016-08-05 12:20:11 +02:00
Laurent Destailleur
f0c75388cb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/compta/facture/class/api_invoice.class.php
	htdocs/product/class/api_product.class.php
	htdocs/societe/class/api_contact.class.php
	htdocs/societe/class/api_thirdparty.class.php
 2016-08-02 17:43:12 +02:00
Laurent Destailleur
cc21909909 Fix dol_include_once could not work to get external url of a module 2016-08-02 14:33:46 +02:00
Laurent Destailleur
a353093ae7 NEW Phone formatting for Canada. Add dol_print_phone into phpunit tests 2016-08-01 20:18:31 +02:00
Laurent Destailleur
a35dd9f2d1 Fix bad separation of address 2016-08-01 19:37:17 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
51e941b9b4 Fix for option MAIN_OPTIMIZEFORTEXTBROWSER 2016-07-31 13:07:55 +02:00
Laurent Destailleur
a6147ee73b Miscellaneous fixes 2016-07-30 14:49:29 +02:00
Laurent Destailleur
74a9bbbf38 FIX private property can't be read when building pdf 2016-07-28 23:51:09 +02:00
Laurent Destailleur
d619a641ce Fix regression (empty log were output) 2016-07-28 14:11:41 +02:00
Laurent Destailleur
aae2086ada Move notes on dedicated tabs like other elements. 
Rename also the note available into translation tab into "other" to
avoid confusion because it was not the same usage.
 2016-07-28 13:53:17 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Laurent Destailleur
3d2dc3c66e NEW Each user can select its landing page. 2016-07-26 21:12:52 +02:00
Laurent Destailleur
b615b52f47 FIX html detection fails if only u tag is present 2016-07-26 16:11:38 +02:00
florian HENRY
419dd3095b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_fix5353

Conflicts:
	htdocs/societe/class/societe.class.php
 2016-07-26 08:59:40 +02:00
Laurent Destailleur
f0a3a5ce02 NEW Mutualize mass action. So "Send by email" is also avavilable on 
orders.
 2016-07-25 21:50:41 +02:00
Laurent Destailleur
3265b7028d Merge remote-tracking branch 'origin/4.0' into develop 2016-07-25 19:53:28 +02:00
Laurent Destailleur
07d0f457b4 Fix: files generated by mass action could not be loaded 2016-07-23 12:44:28 +02:00