Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,477 Commits 36 Branches 189 Tags
2f5dbdc8a3a2bc5183432bb0014b5eb4794a6c20
Commit Graph

5459 Commits

Author SHA1 Message Date
Laurent Destailleur
6d25b8630b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/prelevement.php
	htdocs/core/class/rssparser.class.php
 2020-06-23 11:38:20 +02:00
Laurent Destailleur
566c1aaf84 Fix for credit transfer module 2020-06-22 22:54:33 +02:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2020-06-20 12:28:14 +02:00
Laurent Destailleur
989737af6b Update website templates 2020-06-19 10:36:19 +02:00
Laurent Destailleur
6c2d70d43b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-17 19:27:39 +02:00
Laurent Destailleur
2f687a3c40 FIX #14033 2020-06-17 17:57:32 +02:00
Laurent Destailleur
f0e4fa40f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-16 22:42:07 +02:00
Laurent Destailleur
b90a45ed7a Complete #14078 2020-06-16 22:41:50 +02:00
Laurent Destailleur
faf4da0d68 Merge branch 'develop' into fixloan2 2020-06-16 22:40:45 +02:00
Laurent Destailleur
15dd1bd705 Merge 2020-06-14 21:50:40 +02:00
Laurent Destailleur
2d5c35b12a Fix debug sepa module 2020-06-14 21:46:32 +02:00
DEMAREST Maxime (Indelog)
4df658ccb2 Fix and improvement on Loan module 
* Fix page redirection on loan delete.
* Add dedicated status for loan with started payment (show if payment is
  started on loan card).
* Add fk_payment_loan property for loan_schedule and add link to loan payment
  on shedule page for paid line.
* Make it not possible to use schedule if start loan payment without it (else
  values in schedule can't be good).
* If modify capital in payment with schedule set, automatically updates it
  with the new value.
* Can't modify interest in payment if schedule is used (causes the
  inconsistency for value in schedule).
* User right verification on schedule page.
 2020-06-13 09:32:44 +02:00
Laurent Destailleur
dc87d89204 Update 12.0.0-13.0.0.sql 2020-06-12 01:03:58 +02:00
Laurent Destailleur
c27eb5e623 Update llx_const.sql 2020-06-12 01:03:34 +02:00
Laurent Destailleur
fa3ca5c644 Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-06-12 01:00:15 +02:00
Laurent Destailleur
77c1c46285 Merge pull request #14032 from ptibogxiv/patch-343 
NEW convert all subscription in datetime
 2020-06-12 00:47:55 +02:00
Anthony Berton
c00b55c980 Update 11.0.0-12.0.0.sql 2020-06-11 18:45:35 +02:00
Anthony Berton
bda4753e41 Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-06-11 18:44:38 +02:00
Anthony Berton
ce7767a154 Create 11.0.0-12.0.0.sql 2020-06-11 18:39:44 +02:00
Anthony Berton
3214b5f199 Merge branch 'PRODUCT_PRICE_BASE_TYPE' of https://github.com/bb2a/dolibarr into PRODUCT_PRICE_BASE_TYPE 2020-06-11 18:37:25 +02:00
Anthony Berton
4a77d06b1e o 2020-06-11 15:45:31 +02:00
Anthony Berton
848c9df537 Add files via upload 2020-06-11 15:38:05 +02:00
Laurent Destailleur
a70e493c5d Migration 2020-06-08 11:43:00 +02:00
Laurent Destailleur
6f12488e30 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2020-06-07 19:55:48 +02:00
Laurent Destailleur
d1dba53f61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/modules.php
	htdocs/install/mysql/migration/repair.sql
 2020-06-07 19:40:17 +02:00
Laurent Destailleur
941362e683 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture.class.php
 2020-06-07 18:59:49 +02:00
Laurent Destailleur
180a0a4557 Info for debug 2020-06-07 18:30:46 +02:00
Laurent Destailleur
f19064abfa Merge pull request #14044 from dolibit-ut/patch-29 
create index.html
 2020-06-06 21:08:11 +02:00
Laurent Destailleur
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +02:00
Laurent Destailleur
a305c43901 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/societe/card.php
	htdocs/ticket/card.php
 2020-06-06 11:51:39 +02:00
Laurent Destailleur
5dd9f4e4c4 Fix travis false positive 2020-06-06 11:36:24 +02:00
UT from dolibit
38b359392a create index.html 2020-06-06 02:06:55 +02:00
Laurent Destailleur
ca3f62e4ac Doc repair Row size too large 2020-06-05 17:47:52 +02:00
Laurent Destailleur
c7a614bd50 Fix clean data 2020-06-04 17:07:22 +02:00
ptibogxiv
319710d6aa Update 12.0.0-13.0.0.sql 2020-06-04 16:50:24 +02:00
ptibogxiv
7da6a063f9 Update llx_subscription.sql 2020-06-04 16:46:36 +02:00
Laurent Destailleur
2324834b73 Debug modulebuilder for doc generation 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/modulebuilder/template/admin/setup.php
 2020-06-01 16:47:50 +02:00
Laurent Destailleur
58e76947ac Debug modulebuilder for doc generation 2020-06-01 16:44:22 +02:00
Laurent Destailleur
f63aa7f527 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
 2020-05-31 23:27:20 +02:00
Laurent Destailleur
67f007ea40 Fix length of field. Make some module die. 2020-05-31 23:12:26 +02:00
Laurent Destailleur
8dbc0ff040 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/prelevement.php
	htdocs/admin/system/phpinfo.php
	htdocs/modulebuilder/index.php
 2020-05-31 00:31:14 +02:00
Laurent Destailleur
c2a9819daa Debug establishment management 2020-05-29 21:45:50 +02:00
Laurent Destailleur
5a9d968a75 Fix MAIN_BUGTRACK_ENABLELINK and MAIN_HELP_DISABLELINK setting 2020-05-29 00:02:03 +02:00
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
 2020-05-28 20:20:39 +02:00
Laurent Destailleur
9d7a4cae00 Fix default value 2020-05-28 17:49:56 +02:00
Christian Foellmann
50bac41399 fix #13988 - missing batch field extension 2020-05-28 15:19:48 +02:00
Laurent Destailleur
a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php
 2020-05-27 23:07:18 +02:00
Laurent Destailleur
15f2165c12 Fix work on payment by bank transfer (avoid confusion between record) 2020-05-27 20:14:11 +02:00
Laurent Destailleur
2f1e653f2f Fix css 2020-05-27 15:29:09 +02:00
Laurent Destailleur
34d7dbe7e9 Fix css 2020-05-27 14:42:17 +02:00