Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,848 Commits 35 Branches 179 Tags 1.7 GiB
f8b0e535fa
Commit Graph

4164 Commits

Author SHA1 Message Date
Laurent Destailleur
98ef978b2a NEW Introduce code syntax coloration with mode 'ace' for DolEditor. 2017-07-18 03:18:16 +02:00
Laurent Destailleur
ae7f2ac253 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-17 20:21:35 +02:00
Laurent Destailleur
e5ec0a785d Fix use command standard @... to mark a change in official code 2017-07-17 20:20:38 +02:00
Laurent Destailleur
4582b54e91 Fix use command standard @... to mark a change in official code 2017-07-17 20:09:19 +02:00
Laurent Destailleur
25f9d782dc NEW Add non intrusive js library to make syntaxic coloring of textarea 2017-07-12 12:30:07 +02:00
Laurent Destailleur
eff4282cc2 Clean files 2017-07-07 22:19:01 +02:00
mikee2
6a35047020 Updated to use dolibarr timme functions 
Redefined macro strings to adapt to dolibarr date functions return values. Keep same macro names when possible to avoid breaking existing code. Some macro holders (not commonly used) have been dropped because non existing values in dolibarr date functions.

Per eldy request changed php date functions with dolibarr's internal date functions to match users time zone. Now dates are those of the user's timezone so check that is is correctly defined in user's profile.
 2017-06-14 12:53:29 +02:00
Laurent Destailleur
f011197e00 Update swagger to 2.0.24 2017-05-24 15:12:45 +02:00
Alexandre SPANGARO
16a41242d3 Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-05-08 06:39:14 +02:00
mikee2
637e1a8d21 Update Segment.php 
Add additional needed fields so that you can invoice yearly items. Have number and text descriptions to avoid future changes that may break existing invoices.
 2017-05-06 10:49:37 +02:00
Laurent Destailleur
11b1a2adac Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/bank/index.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/includes/odtphp/Segment.php
	htdocs/langs/en_US/admin.lang
	htdocs/societe/soc.php
 2017-05-05 14:49:25 +02:00
Laurent Destailleur
bb47c69283 Merge pull request #6685 from mikee2/develop 
Add macro replacement to ODT invoice lines
 2017-04-29 21:20:19 +02:00
Alexandre SPANGARO
586ea54bfc Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-29 07:05:02 +02:00
Laurent Destailleur
05fe0d7fcd Fix doxygen 2017-04-29 01:01:12 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
 2017-04-27 17:20:40 +02:00
Laurent Destailleur
af56c85057 Fix perms on file 2017-04-24 03:11:19 +02:00
Alexandre SPANGARO
d0e27f67e7 Add plugins Stripe 2017-04-18 05:44:08 +02:00
mikee2
e6b20840a3 Update Segment.php 2017-04-14 11:49:30 +02:00
mikee2
f460d2e705 Update Segment.php 2017-04-09 21:39:15 +02:00
fappels
527fa27fb7 Add jquery-migrate to handle jquery 3.0 removes 2017-03-29 11:18:03 +02:00
Laurent Destailleur
a5c11dc840 NEW Add function dolMd2Html 2017-03-21 16:03:13 +01:00
Laurent Destailleur
0b69d0143b Try jSignature 2017-03-03 15:26:51 +01:00
Laurent Destailleur
0f22beb774 Upgrade to ckeditor 4.6.2. 2017-02-28 10:49:58 +01:00
Laurent Destailleur
559478048c Move resources for theme at a batter place 2017-02-24 14:38:20 +01:00
Laurent Destailleur
f75af2af37 Close #6146 - Let's experiment fontawesome. 2017-02-24 14:37:18 +01:00
Laurent Destailleur
baa1f3ed2b Clean doc about changes in external libraries 2017-02-24 14:35:20 +01:00
Laurent Destailleur
49d0deea39 NEW Upgrade jquery to 3.3.1 and jquery-ui to 1.12 2017-02-23 00:46:19 +01:00
Laurent Destailleur
fbecb1b2d8 Work on removal of jmobile 2017-02-23 00:45:27 +01:00
Laurent Destailleur
64721d73b6 Remove not so usefull plugin jquery layout (prepare js upgrades) 2017-02-22 19:36:57 +01:00
Laurent Destailleur
bab4f5c185 Removed useless library FPDFI. 2017-02-22 18:00:34 +01:00
Laurent Destailleur
bc43a052f4 Default usage to send token is header. 2017-02-03 12:16:13 +01:00
Laurent Destailleur
db220e7af5 FIX Rename api_key into DOLAPIKEY to allow to use it on http header. 2017-01-22 20:55:26 +01:00
Laurent Destailleur
82492dc023 Fix oauth2 token generation for Google. The refresh token was not 
received.
 2017-01-17 20:05:10 +01:00
Laurent Destailleur
9cfc8d4095 Fix several problems into OAuth2 module. 2017-01-06 19:58:46 +01:00
Laurent Destailleur
1082997f62 FIX #5972 #5734 2016-11-11 15:19:25 +01: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
7ceb3cb62a FIX Avoid error 500 if phpexcel is disabled 2016-10-22 16:53:22 +02:00
Laurent Destailleur
ba52eb870c Enhancement of Oauth module 2016-10-07 18:43:44 +02:00
Laurent Destailleur
03ebe769d7 Clean sources from not used libraries. 2016-10-05 00:38:17 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
Laurent Destailleur
828fe984e8 FIX #5734 2016-09-12 00:09:46 +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
9fabfe029b Remove debug logs 2016-07-29 16:31:29 +02:00
Laurent Destailleur
b85bb8c0f8 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-29 16:24:02 +02:00
Laurent Destailleur
2866d60240 Revert "change jsgantt to jsGanttImproved" 
This reverts commit caf963351b.
 2016-07-26 13:59:08 +02:00
Sergio Sanchis Climent
71d153c4e2 change jsgantt to jsGanttImproved 2016-07-26 13:56:34 +02:00
Sergio Sanchis Climent
caf963351b change jsgantt to jsGanttImproved 2016-07-26 01:59:27 +02:00
Laurent Destailleur
d0380adc39 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/includes/jquery/plugins/datatables/media/js/jquery.js
	htdocs/product/list.php
 2016-07-16 19:54:57 +02:00
Laurent Destailleur
931531232c FIX duplicate jquery.js files 2016-07-16 19:38:18 +02:00
Laurent Destailleur
6f489c1fbd FIX Missing original .js file (license violation if sources are not 
provided)
 2016-07-16 19:19:52 +02:00
Laurent Destailleur
0c5851d566 Fix CRLF 2016-07-15 14:49:48 +02:00
Laurent Destailleur
061ccadd03 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/fourn/commande/orderstoinvoice.php
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 15:11:29 +02:00
Laurent Destailleur
a8f06d78b1 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 14:53:05 +02:00
Laurent Destailleur
00749b2a65 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/imports/import.php
	htdocs/includes/odtphp/odf.php
	htdocs/product/stock/product.php
	htdocs/projet/list.php
 2016-06-22 20:22:22 +02:00
Laurent Destailleur
f514400d87 FIX a case of corrupted ODT by Word that insert <text:s> when it should 
not.
 2016-06-22 20:08:29 +02:00
Laurent Destailleur
cf8c180fa4 Fix perm and CRLF 2016-05-18 16:26:15 +02:00
Laurent Destailleur
bba3dc7dcd Make composer cleaner 2016-05-18 13:39:57 +02:00
Laurent Destailleur
9f20779136 Revert "Update escpos-php" 
This reverts commit 2f42a226d0.
 2016-05-18 13:18:55 +02:00
Laurent Destailleur
e7385c9e4f Try to solve side effect of this fuck... autoload creating a big mess in 
a lot of features.
 2016-05-18 11:57:13 +02:00
Laurent Destailleur
e6196f69cd Fix Restler bug returning warnings 2016-05-18 00:45:13 +02:00
Laurent Destailleur
af38d03825 Clean copyright and libs 2016-05-13 23:22:39 +02:00
Laurent Destailleur
d980742b6c Merge pull request #5057 from nka11/restler3.0.0RC6 
Update Restler to 3.0.0RC6
 2016-05-13 23:15:16 +02:00
Laurent Destailleur
2308d28c19 FIX Add test code to detect/test autoload conflict 2016-05-13 19:23:56 +02:00
nka11
c957cfc260 removing String class which cause server Error with php7 2016-05-11 13:22:58 +02:00
Laurent Destailleur
5a75f346ff Debug advanced selector 2016-05-06 00:02:22 +02:00
Florian HENRY
3d57e83094 Merge branch 'develop' into develop_advtargetemailiing 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
 2016-05-02 20:40:42 +02:00
nka11
c8432fcccd Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into restler3.0.0RC6 2016-04-26 07:37:58 +02:00
Laurent Destailleur
3278c8245b Merge pull request #5020 from frederic34/swiftmailer 
Add Swift Mailer to send mails
 2016-04-22 20:12:58 +02:00
Laurent Destailleur
ff5f04dee1 Removed not required directories 2016-04-22 11:11:24 +02:00
Laurent Destailleur
d735f5dc70 FIX lost css change 2016-04-22 11:10:20 +02:00
nka11
b60389cec4 Update Restler to 3.0.0RC6 2016-04-21 08:13:19 +02:00
frederic34
567dc1734e Add Swift Mailer to send mails 2016-04-16 18:15:03 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/fourn/facture/card.php
	htdocs/product/composition/card.php
 2016-04-12 15:00:02 +02:00
Frédéric FRANCE
f90cffd74a Update nusoap.php 
re-establish user-agent
 2016-04-09 15:42:53 +02:00
Laurent Destailleur
66ec4cdcf6 Update pdfmake.js 2016-04-08 15:53:13 +02:00
Laurent Destailleur
443c5a490a Update ckeditor to 4.5.8 2016-04-08 15:36:24 +02:00
Laurent Destailleur
9d836571d5 Update PHPExcel 2016-04-08 15:32:13 +02:00
Laurent Destailleur
2f42a226d0 Update escpos-php 2016-04-08 15:30:43 +02:00
Florian HENRY
ae51321040 Debug Advance target emailing 2016-04-01 14:30:02 +02:00
Laurent Destailleur
b29b5fa71d Merge pull request #4824 from FHenry/dev_jquery 
Last version of JQuery 1.12 and DataTables Componenent with working
 2016-03-25 16:50:26 +01:00
Laurent Destailleur
a68b704daf FIX Must not return error when vars does not exists 2016-03-25 15:57:36 +01:00
Laurent Destailleur
80e10158a5 Add code comment 2016-03-25 15:57:29 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
a2b3b24ca9 FIX Must not return error when vars does not exists 2016-03-22 22:01:07 +01:00
Laurent Destailleur
dd26ede0ef Add code comment 2016-03-22 19:24:48 +01:00
Florian HENRY
371e593da3 better includes externel library 2016-03-18 10:56:55 +01:00
Florian HENRY
781059bbb7 add missing lib 2016-03-15 11:59:43 +01:00
Florian HENRY
28391a4e4d Last version of JQuery 1.12 and DataTables Componenent with working 
export Excel,CVS,PDF, etc..
 2016-03-15 11:57:53 +01:00
Laurent Destailleur
543f5cef63 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/initdemo.sh
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
 2016-03-13 01:31:12 +01:00
Laurent Destailleur
bad07bc38c Fix dos and bom and end of line 2016-03-12 18:30:19 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Laurent Destailleur
64374bec00 Fix avoid wrapping in select2 combo list 2016-02-29 15:28:06 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
Laurent Destailleur
ebd9a97bab Prepare 3.9 2016-02-06 15:55:05 +01:00
Laurent Destailleur
cf6c06f9e7 Reduce lost space into ckeditor margins 2016-01-28 04:47:31 +01:00
Laurent Destailleur
f3c83fba59 Merge pull request #4201 from GPCsolutions/dolibarr-composer 
Composer updates
 2016-01-10 11:56:47 +01:00
Laurent Destailleur
40963f2f2a FIX #4207 2015-12-27 18:46:21 +01:00
Laurent Destailleur
2f8fc05cdb Fix: QRcode must not be random 2015-12-20 21:28:05 +01:00