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

81140 Commits

Author SHA1 Message Date
Laurent Destailleur
be39e50214
Merge pull request #15567 from andreubisquerra/develop 
Improve free entries printing in TakePOS
 2020-11-28 02:19:14 +01:00
Laurent Destailleur
f7c4ad646f
Merge pull request #15561 from frederic34/addecmcard 
doxygen
 2020-11-28 02:14:34 +01:00
Laurent Destailleur
df461d319e Fix warning 2020-11-28 02:12:07 +01:00
Laurent Destailleur
7e6af6a54f FIX translation not loaded for error message of numbering modules 2020-11-28 02:09:27 +01:00
Laurent Destailleur
7c4599a5c5 Look and feel v13 2020-11-28 01:15:23 +01:00
Laurent Destailleur
1685b5396c Fix warning 2020-11-28 00:59:07 +01:00
andreubisquerra
c9c2869eec
Fix travis 2020-11-27 19:45:40 +01:00
andreubisquerra
c3bc662675
Improve free entries printing in TakePOS 
Improve free entries printing with Receipt Printer module in TakePOS
 2020-11-27 19:24:27 +01:00
Laurent Destailleur
73790a0958 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/card.php
 2020-11-27 16:21:32 +01:00
Laurent Destailleur
5ed2bbb204 Fix error message 2020-11-27 16:13:27 +01:00
Laurent Destailleur
574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/adherents/class/subscription.class.php
	htdocs/compta/bank/categ.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/class/interfaces.class.php
	htdocs/core/lib/project.lib.php
	htdocs/core/modules/modCategorie.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/install/repair.php
	htdocs/main.inc.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
	htdocs/reception/card.php
 2020-11-27 15:45:12 +01:00
Laurent Destailleur
4a5cdd0092 Several fixes in export and repair tool 2020-11-27 15:27:35 +01:00
Laurent Destailleur
9ce6d87b83 Clean code 2020-11-27 15:04:58 +01:00
stickler-ci
aaf8d43780 Fixing style errors. 2020-11-27 13:33:37 +00:00
iouston
59c40227ff
Add PROPAL_ENABLE_NEGATIVE 
in the case of a call for tenders it is possible to have to figure in less value with quotations whose total is negative
 2020-11-27 14:31:14 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Frédéric FRANCE
b9bac939e6
doxygen 2020-11-27 09:11:30 +01:00
Laurent Destailleur
7ebab06111 css 2020-11-27 01:32:21 +01:00
Laurent Destailleur
7bf12c8720 Fix name into popup of member in list of subscriptions 2020-11-27 01:22:13 +01:00
Laurent Destailleur
47a5037155 Fix dolGetFirstLastname() for 4 and 5 2020-11-27 01:18:01 +01:00
Laurent Destailleur
0834e4801e
Merge pull request #15554 from frederic34/mailing 
doxygen
 2020-11-27 01:01:52 +01:00
Laurent Destailleur
01176e2422
Merge pull request #15553 from frederic34/adminmenu 
remove warnings
 2020-11-27 01:00:21 +01:00
Laurent Destailleur
2cf005d22c Removed warning 2020-11-27 00:39:49 +01:00
Laurent Destailleur
250b42f60a Fix phpcs 2020-11-27 00:37:36 +01:00
Frédéric FRANCE
fa6d02fb3f
doxygen 2020-11-27 00:25:45 +01:00
Frédéric FRANCE
bb09c84417
doxygen 2020-11-27 00:23:03 +01:00
Frédéric FRANCE
446997d0ba
doxygen 2020-11-27 00:15:07 +01:00
Frédéric FRANCE
12dce9cd75
avoid large screen for code 2020-11-26 23:53:10 +01:00
Laurent Destailleur
97f6efb079 Fix avoid to trigger sql injection detection 2020-11-26 23:50:00 +01:00
Frédéric FRANCE
f03930e55e
doxygen 2020-11-26 23:49:42 +01:00
Laurent Destailleur
b6640da281 Fix javascript obfuscating with HTML comments 2020-11-26 23:37:35 +01:00
Laurent Destailleur
4da4499569 FIX Param joinfiles not sanitized 
Conflicts:
	htdocs/admin/mails_templates.php
 2020-11-26 23:07:52 +01:00
Laurent Destailleur
4114201da9 FIX Param joinfiles not sanitized 2020-11-26 23:05:49 +01:00
Laurent Destailleur
61c0c7f0a6 Fix GETPOST second param 2020-11-26 22:59:05 +01:00
Laurent Destailleur
b3b511a6d4 FIX #15546 2020-11-26 22:44:11 +01:00
Laurent Destailleur
5d9098795f Fix labels in combo 2020-11-26 19:17:09 +01:00
Laurent Destailleur
084b2411df
Merge pull request #15550 from OPEN-DSI/new-supplier-product-list-with-stock 
NEW show stock in supplier product select list
 2020-11-26 18:56:04 +01:00
Laurent Destailleur
82da0d01f1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formorder.class.php
	htdocs/fourn/commande/list.php
 2020-11-26 18:52:00 +01:00
Laurent Destailleur
9aa657bc35 Debug v13 2020-11-26 18:48:51 +01:00
Laurent Destailleur
b043442b91 Fix link and selection of status of purchase order. 2020-11-26 17:53:57 +01:00
Laurent Destailleur
c994b3b6f2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-11-26 17:02:19 +01:00
Laurent Destailleur
22c2cfd9ec FIX warning for purchase order delivery late. 2020-11-26 16:57:39 +01:00
Laurent Destailleur
52cc08f5da FIX option "Show subtotal" on the balance report 2020-11-26 16:12:55 +01:00
Laurent Destailleur
3ccc9d3e57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-26 15:29:57 +01:00
Laurent Destailleur
bd780a8c51 FIX Warning on late purchase order delivery 2020-11-26 15:29:18 +01:00
Laurent Destailleur
f231620084 Fix creation of MRP when product is a kit. 2020-11-26 14:32:40 +01:00
Laurent Destailleur
187ba94a57 Look and feel v13 2020-11-26 14:24:52 +01:00
Laurent Destailleur
3588781180 Debug v13 2020-11-26 14:15:20 +01:00
lvessiller
17e13eb821 NEW show stock in supplier product select list 2020-11-26 14:12:02 +01:00
Laurent Destailleur
5d0a54c0de Fix var not defined 2020-11-26 12:07:01 +01:00
Laurent Destailleur
e1a6e8f2fc CSS 
Security: Add param to fight against Clickjacking attacks
 2020-11-26 11:29:16 +01:00
Laurent Destailleur
c7e5b0dcc1 Fix warning 2020-11-26 10:12:24 +01:00
Laurent Destailleur
69b06a25e8 Fix code of deletion of objects 2020-11-26 09:16:16 +01:00
Laurent Destailleur
e272130a6a Fix phpcs 2020-11-26 08:40:08 +01:00
Laurent Destailleur
22bcb08950 Update doc 2020-11-25 23:03:17 +01:00
Laurent Destailleur
8fa2005c64
Merge pull request #15545 from proprum/patch-1 
Adding require_once files.lib to fourn/paiement.
 2020-11-25 19:59:49 +01:00
Laurent Destailleur
77c8631528
Merge pull request #15544 from frederic34/patch-14 
doxygen
 2020-11-25 19:58:55 +01:00
Laurent Destailleur
c1a1d4330a
Update expensereport.class.php 2020-11-25 19:55:11 +01:00
proprum
d1cded49a9
Adding require_once files.lib to fourn/paiement. 
Bug when there is a calculated extrafield which use "dol_dir_list" for calculating the amount of files attached to a invoice

With bonus : the integer calculated extrafield configuration : 
count(dol_dir_list($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'invoice_supplier').dol_sanitizeFileName($object->ref),'files',0,'','(\.meta|_preview.*\.png)$'));
 2020-11-25 19:47:30 +01:00
Frédéric FRANCE
f333dffa4b
doxygen 2020-11-25 18:45:25 +01:00
Frédéric FRANCE
9e56253704
Update expensereport.class.php 2020-11-25 18:37:03 +01:00
Laurent Destailleur
64e9944472
Merge pull request #15542 from frederic34/patch-14 
doxygen
 2020-11-25 18:15:00 +01:00
Frédéric FRANCE
d9759c4a54
doxygen 2020-11-25 18:12:59 +01:00
Bernard Saulme
be7714be1c
Use email model option to joint file for subscription 
Allow the adherent subscription to use the email model option to join or no joint file.
 2020-11-25 18:11:36 +01:00
Frédéric FRANCE
83f6e9dfc2
doxygen 2020-11-25 18:08:13 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +01:00
Laurent Destailleur
8ee9e59173 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-25 18:04:22 +01:00
Laurent Destailleur
d8bf7b2714 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
 2020-11-25 18:04:06 +01:00
Laurent Destailleur
f91226a9f0
Merge pull request #15537 from maboelfotoh/maboelfotoh-fix-pr-13067 
FIX #13067 including opening balance in calculation of displayed balance
 2020-11-25 17:54:09 +01:00
Laurent Destailleur
ccfb7f8256
Merge pull request #15538 from frederic34/patch-8 
remove warning
 2020-11-25 17:47:11 +01:00
Laurent Destailleur
168e35a035 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-25 17:29:09 +01:00
Laurent Destailleur
16e3baeff2 FIX filter on project list 2020-11-25 17:28:53 +01:00
Frédéric FRANCE
5ff3ab528c
remove warning 2020-11-25 17:15:06 +01:00
Frédéric FRANCE
7ca1df6d46
remove warning 2020-11-25 17:12:56 +01:00
Muhammad Aboelfotoh
551256b779 FIX #13067 including opening balance in calculation of displayed balance 2020-11-25 15:11:09 +00:00
Laurent Destailleur
c9371e9eb0
Merge pull request #15512 from fappels/12_fix_transfer_expline_extrafield 
Fix issue #15506 tansfer line extrafield order  to expedition
 2020-11-25 15:30:07 +01:00
Laurent Destailleur
944e2a8032 Fix delete of expense report 2020-11-25 15:29:18 +01:00
Laurent Destailleur
54913c6a75
Merge pull request #15535 from defrance/patch-162 
fix better delete management (include extrafield too)
 2020-11-25 15:11:57 +01:00
Laurent Destailleur
4d90fb22de Fix sql syntax error 2020-11-25 15:07:26 +01:00
Francis Appels
a734e1caa7 line is order line not exp line 2020-11-25 15:06:07 +01:00
Laurent Destailleur
5030f0c587 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/opensurvey/wizard/create_survey.php
 2020-11-25 14:55:31 +01:00
Laurent Destailleur
bf7b6ee00d Fix delete of proposal 2020-11-25 14:15:59 +01:00
stickler-ci
9da8cf63a2 Fixing style errors. 2020-11-25 12:07:57 +00:00
Laurent Destailleur
ac859bc38e
Merge pull request #15531 from FHenry/develop 
Fix bank transfert supplier
 2020-11-25 13:06:10 +01:00
BENKE Charlene
62c361dc1a
fix better delete management (include extrafield too) 2020-11-25 13:04:26 +01:00
Laurent Destailleur
4e5e499ddd
Merge pull request #15521 from andreubisquerra/develop 
Order receipt improvements in TakePOS
 2020-11-25 13:01:57 +01:00
Laurent Destailleur
42c30584f4
Merge pull request #15522 from frederic34/patch-15 
Update api_thirdparties.class.php
 2020-11-25 12:53:36 +01:00
Laurent Destailleur
7bb6b24b96
Merge pull request #15505 from ptibogxiv/patch-394 
Fix api contact
 2020-11-25 12:52:45 +01:00
Laurent Destailleur
f754b48478
Merge pull request #15520 from frederic34/patch-14 
doxygen
 2020-11-25 12:52:15 +01:00
Laurent Destailleur
e23a23af31
Merge pull request #15527 from StephaneLesage/refresh-prospecting-status-after-update 
FIX: refresh of prospecting icon/label after modifying status
 2020-11-25 12:52:00 +01:00
Laurent Destailleur
87d17e4eb8
Merge pull request #15518 from frederic34/patch-8 
doxygen
 2020-11-25 12:49:36 +01:00
Laurent Destailleur
2ac36be531
Merge pull request #15514 from frederic34/doxygen 
doxygen
 2020-11-25 12:49:24 +01:00
Laurent Destailleur
cf2276a86c
Merge pull request #15529 from FHenry/dev_mass_action_create_supplierwithdraw 
fix : finish bank transfert in mass action from supplier invoice list
 2020-11-25 12:48:45 +01:00
Laurent Destailleur
0ad0035f19
Update list.php 2020-11-25 12:47:10 +01:00
Laurent Destailleur
4917403365 Avoid dynamic var 2020-11-25 12:46:03 +01:00
Laurent Destailleur
67a1059d19
Merge pull request #15533 from FHenry/dev_fix_survey 
fix survey
 2020-11-25 12:43:22 +01:00
Laurent Destailleur
6e7ff7beeb
Merge pull request #15530 from hregis/develop_bug2 
FIX missing "price_base_type" and refactor to include cache
 2020-11-25 12:42:18 +01:00
Laurent Destailleur
0eda49c4ac
Merge pull request #15523 from frederic34/patch-18 
fix api generateBankAccountDocument
 2020-11-25 12:37:47 +01:00
Florian HENRY
e2b96a834d add SCOP and SCIC in ent form juridique 2020-11-25 12:11:00 +01:00
Florian HENRY
345b3cbfc8 fix survey 2020-11-25 11:38:58 +01:00