lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
100,555 Commits 43 Branches 150 Tags 886 MiB
c03958a867
Commit Graph

5831 Commits

Author SHA1 Message Date
Frédéric FRANCE
00d60aa65a
doxygen 2021-05-27 16:54:41 +02:00
Laurent Destailleur
bad90240bc
Update pdf_cyan.modules.php 2021-05-25 21:39:50 +02:00
Laurent Destailleur
20c3ebeb51 Make SimplePOS deprecated 2021-05-19 19:46:46 +02:00
Florian HENRY
6f3d19b7b6 dol_concatdesc better than concat operator 2021-05-17 15:12:25 +02:00
Florian HENRY
f95bd2f439 fixw that 2021-05-17 11:40:36 +02:00
Laurent Destailleur
4768729c09 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/core/class/rssparser.class.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/expedition/list.php
 2021-05-17 07:57:32 +02:00
Laurent Destailleur
2f2ba933f8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:33:28 +02:00
Laurent Destailleur
5a15dbf545 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:29:19 +02:00
Maxime Kohlhaas
db32f882e8 Fix use of DatePropal instead of Date 2021-05-15 07:45:04 +02:00
Laurent Destailleur
aa05788d62 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/security.lib.php
	htdocs/core/modules/societe/mod_codeclient_elephant.php
	htdocs/filefunc.inc.php
	test/phpunit/CodingPhpTest.php
 2021-05-11 20:34:46 +02:00
Laurent Destailleur
8336f56b40
Merge pull request #17539 from AlexisLaurier/fix/elephantClientCodeVerifDispoMultiEntity 
add entity check on verif_dispo mod_codeclient_elephant
 2021-05-11 19:13:17 +02:00
Laurent Destailleur
d8cbb735a3 Fix rtl language for pdf 2021-05-11 17:58:00 +02:00
Laurent Destailleur
6499270619 v14 2021-05-10 15:29:23 +02:00
Laurent Destailleur
a2cd181435 FIX Debug reception module 2021-05-10 11:53:19 +02:00
Laurent Destailleur
1fb5b0f681 Fix rtl languages 2021-05-09 20:25:57 +02:00
Laurent Destailleur
3ad8827c8a Clean code 2021-05-09 20:17:17 +02:00
Alexis LAURIER
e4a430f638 add entity check on verif_dispo mod_codeclient_elephant 2021-05-08 10:24:08 +02:00
Laurent Destailleur
a22d3f8627
Merge pull request #17301 from andreubisquerra/master 
NEW More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
 2021-05-06 17:20:46 +02:00
Laurent Destailleur
d5c737ddb6
Update modTakePos.class.php 2021-05-06 17:19:28 +02:00
Laurent Destailleur
bd5e141d26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php
 2021-05-06 17:07:44 +02:00
Laurent Destailleur
0867be4af5
Merge pull request #17513 from dolibit-ut/patch-320 
Update modules_member.class.php
 2021-05-06 16:27:45 +02:00
Laurent Destailleur
5a927702c0
Merge pull request #17500 from fmarcet/develop 
NEW: Add import on BOM
 2021-05-06 16:21:09 +02:00
Laurent Destailleur
9e057332f0
Merge pull request #17486 from NextGestion/dolibarr_partnership 
Dolibarr partnership
 2021-05-06 16:11:13 +02:00
UT from dolibit
9cd78e6ecf
Update modules_member.class.php 2021-05-06 16:00:49 +02:00
Ferran Marcet
6f66efacb8 New: Add import on BOM 2021-05-05 13:47:43 +02:00
Laurent Destailleur
3807804acc Fix option MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE 2021-05-05 00:15:52 +02:00
Laurent Destailleur
526235d020 Fix substitution of mix html/nohtml 
Fix send email reminder for past due date of invoices
More PHPUnit test
 2021-05-04 13:33:18 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01:00
Laurent Destailleur
6e32efdb40 Fix phpcs 2021-05-03 20:22:36 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
 2021-05-03 19:36:49 +02:00
Laurent Destailleur
5962f1cccd
Merge pull request #17445 from OPEN-DSI/new-societe-compta-code-digiteria 
NEW rise code tries in digeteria customer and supplier accountant code
 2021-05-03 15:57:46 +02:00
Laurent Destailleur
5d870d5802 FIx #17447 2021-05-03 15:36:34 +02:00
Laurent Destailleur
a54e60d345 Look and feel v14 2021-05-02 13:13:55 +02:00
Laurent Destailleur
3edb929f9e Debug v14 2021-05-02 12:43:28 +02:00
Laurent Destailleur
24a58b1956 Removed not used permission 2021-05-02 11:21:01 +02:00
Laurent Destailleur
69511e2706 Debug 2021-04-30 16:15:35 +02:00
lvessiller
ab89fe73c2 NEW rise code tries in digeteria customer and supplier accountant code 2021-04-30 16:08:46 +02:00
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
Laurent Destailleur
67fd5477c9
Merge pull request #17427 from Hystepik/develop#4 
New Module Knowledge Management
 2021-04-30 12:12:15 +02:00
Laurent Destailleur
5a1f2db024 Clean sql 2021-04-30 10:57:21 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Florian HENRY
a7b093ed81 FIX: Espadon PDF shippment model with long public note now wroking 2021-04-29 11:34:09 +02:00
lmarcouiller
d4fb9c7c47 knowledgemanager finished 2021-04-29 10:49:56 +02:00
lmarcouiller
6da32015f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4 2021-04-29 09:45:30 +02:00
Laurent Destailleur
64374f46da Debug v14 2021-04-28 23:01:20 +02:00
Laurent Destailleur
b1d858eb26 Fix translation of new modules 2021-04-28 22:44:57 +02:00
Laurent Destailleur
75a8dc28ea
Merge pull request #17261 from aspangaro/14a39 
Maxi debug of societe/product per entity
 2021-04-28 17:06:45 +02:00
lmarcouiller
d753ef6393 edit of modKnowledgeManagement.class 2021-04-28 15:28:00 +02:00
lmarcouiller
97043ca665 New module KnowledgeManagement 2021-04-28 14:57:49 +02:00
Laurent Destailleur
e50494152d Fix label 2021-04-28 11:22:45 +02:00
Laurent Destailleur
4b204301a9 Enhance logs 2021-04-27 03:25:49 +02:00
Laurent Destailleur
3e013ebad0 Fix mass action delete of cron jobs 2021-04-27 03:16:11 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
Alexandre SPANGARO
d95be3e08b Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-26 13:53:16 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Laurent Destailleur
f1f63cd4e2 Enhance detection of update available 2021-04-20 11:56:26 +02:00
Laurent Destailleur
4fde184afb Add the setup page of module accounting to not search where is setup 2021-04-20 11:40:43 +02:00
Alexandre SPANGARO
d27030df3f Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-20 04:43:14 +02:00
Laurent Destailleur
3aee28fb1b
Merge pull request #17263 from atm-adrien/NEW_add_userGroup_for_user_exports_develop 
NEW : Add possibility to exports userGroups fields on user exports
 2021-04-19 21:58:38 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
Laurent Destailleur
c966914f67
Merge branch 'develop' into new/check_update_for_module 2021-04-19 21:26:01 +02:00
Laurent Destailleur
46ea1084f5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/cibles.php
	htdocs/core/extrafieldsinexport.inc.php
	htdocs/product/stock/card.php
 2021-04-19 20:59:10 +02:00
NextGestion
7cab4dd19d Manage partnership for members & code optimisation 2021-04-19 15:17:57 +01:00
Laurent Destailleur
61df76dd9a Fix pb in date format %a %b when using a negative timezone 
Enhance date management and unit tests.
 2021-04-19 12:48:08 +02:00
Laurent Destailleur
23b11491d2 Can filter also on payment mode 2021-04-19 11:11:01 +02:00
Laurent Destailleur
ad84af1d0a Fix id cron task 2021-04-19 10:39:16 +02:00
Laurent Destailleur
634c8c9fa4 Add a schedule dtask to send reminder by email on date due. 2021-04-19 10:38:52 +02:00
ATM john
d25c544a7a Merge branch 'new/check_update_for_module' of github.com:atm-john/dolibarr into new/check_update_for_module 2021-04-18 22:50:43 +02:00
ATM john
b337422576 Remove ctrl+v 2021-04-18 22:50:34 +02:00
stickler-ci
8ab117a62f Fixing style errors. 2021-04-18 20:40:34 +00:00
ATM john
781756913b Fix code Stickler 2021-04-18 22:38:18 +02:00
ATM john
da11ac42ac New check update for modules 2021-04-18 22:13:37 +02:00
ATM john
7794927a64 New check update for modules 2021-04-18 20:12:24 +02:00
NextGestion
973ea370e8 Fixing errors 2021-04-17 13:38:23 +01:00
NextGestion
5a8742b3eb Cancel Partnership For Expired Members & Warning of partnership if Dolibarr backlink not found on partner website 2021-04-17 13:25:28 +01:00
NextGestion
87bcb212df
Merge branch 'develop' into dolibarr_partnership 2021-04-17 13:51:21 +01:00
Laurent Destailleur
c929c05dc5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-17 03:33:31 +02:00
Laurent Destailleur
0d8a354934 Set default length of password to 12 car. 
FIX #yogosha5855
 2021-04-17 03:11:58 +02:00
andreubisquerra
83da58b85f
Fix travis 2021-04-17 01:17:48 +02:00
jove@bisquerra.com
712e1c4e7c NEW Edit sales lines rights in TakePOS 2021-04-17 01:06:30 +02:00
Laurent Destailleur
70abc04bf5
Merge pull request #17103 from Givriz/dev 
Fix compatibility phpv8
 2021-04-16 20:51:00 +02:00
Laurent Destailleur
1a3e9cae68 Comment 2021-04-16 20:44:30 +02:00
Givriz
86bfcd9510 Easy way to use conf->global 2021-04-16 17:10:11 +02:00
NextGestion
0d4a1d061a
Merge branch 'develop' into dolibarr_partnership 2021-04-16 11:01:08 +01:00
Florian HENRY
99b7deba14 Merge branch '13.0' of github.com:Dolibarr/dolibarr into fix_13_toomanytestmenu 2021-04-16 10:37:50 +02:00
Florian HENRY
0cd567f256 fix double test 2021-04-16 10:37:42 +02:00
Laurent Destailleur
38f54d0582 FIX Missing extrafields into export of agenda record 2021-04-16 10:26:35 +02:00
Givriz
47cdfee1d2 Compatibility pvpv8 2021-04-14 22:03:04 +02:00
Givriz
598156de04 Update modDataPolicy.class.php 
There was useless condition
 2021-04-14 17:58:46 +02:00
NextGestion
4e45011e45 Manage Partnership for third-party 2021-04-14 13:59:38 +01:00
stickler-ci
bcab8d5164 Fixing style errors. 2021-04-14 07:49:18 +00:00
Adrien Raze
c83819bd90 NEW : Add possibility to exports userGroups fields on user exports 2021-04-14 09:44:01 +02:00
Alexandre SPANGARO
2f31720896 Maxi debug of societe/product per entity 2021-04-14 04:45:17 +02:00
Laurent Destailleur
033a243372
Merge pull request #17166 from altairisfr/product_masks 
Product masks
 2021-04-13 23:06:09 +02:00
Laurent Destailleur
161baa672a Fix phpcs 2021-04-13 21:11:02 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Laurent Destailleur
192fcb89d2
Merge pull request #17097 from NextGestion/dolibarr_partnership 
Create Partnership Module
 2021-04-13 16:33:54 +02:00
Frédéric FRANCE
d007e75a8e
Update pdf_eratosthene.modules.php 2021-04-13 09:55:04 +02:00
Frédéric FRANCE
8085f10995
Update pdf_einstein.modules.php 2021-04-13 09:53:51 +02:00
Frédéric FRANCE
8953c0ac3a
Update pdf_cyan.modules.php 2021-04-13 09:49:30 +02:00