Commit Graph

69855 Commits

Author SHA1 Message Date
Frédéric FRANCE
84ff287c36
remove $var from takepos admin setup 2018-09-30 10:56:55 +02:00
Laurent Destailleur
f32ccf935a CSS 2018-09-28 23:06:57 +02:00
Laurent Destailleur
2f88f84e3b Clean code 2018-09-28 22:13:42 +02:00
Laurent Destailleur
aaa5efc77e Clean Take pos module 2018-09-28 22:06:04 +02:00
Laurent Destailleur
a4ec613d73 Move sql table 2018-09-28 19:40:44 +02:00
Laurent Destailleur
51e4ba11d3 Move phpunit 2018-09-28 18:09:50 +02:00
Laurent Destailleur
73458f649f Fix phpcs 2018-09-28 18:09:07 +02:00
Laurent Destailleur
492b9c1a03 Fix phpcs 2018-09-28 18:03:53 +02:00
Laurent Destailleur
f667270d4d Add option to not load all object and fix so linkedObjectsIds has same
content than linkedObjects
2018-09-28 17:38:29 +02:00
Laurent Destailleur
a3065ae612 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-28 16:15:27 +02:00
Laurent Destailleur
e2f450aa8c Fix regession losing description.
Rename updateligne into updateline.
2018-09-28 16:15:17 +02:00
Laurent Destailleur
3de5f8278a
Merge pull request #9623 from medialta/8.0
Fix state name for list field title in adherent
2018-09-28 16:04:54 +02:00
Laurent Destailleur
47da95fbbf Fix dependency of module 2018-09-28 13:50:37 +02:00
Laurent Destailleur
78fbb6cd89 Rename label 2018-09-28 13:48:11 +02:00
Laurent Destailleur
603db250f0 Clean takepos 2018-09-28 13:36:46 +02:00
Laurent Destailleur
f990719daa Add experimental module TakePOS 2018-09-28 13:31:41 +02:00
Laurent Destailleur
ec2dd7ba4e Remove not used code 2018-09-28 13:13:04 +02:00
Laurent Destailleur
e9dd967610 Support nomassaction param on list 2018-09-28 13:12:47 +02:00
Laurent Destailleur
224896a4dc Code comments 2018-09-28 10:52:15 +02:00
Laurent Destailleur
c5a68d2462 Clean code 2018-09-28 10:51:55 +02:00
Laurent Destailleur
b2576305c1 Clean code 2018-09-28 10:46:59 +02:00
Laurent Destailleur
118ff2d8d0 phpcs 2018-09-28 10:42:42 +02:00
Laurent Destailleur
a1c20ceb87 PHP 7.3 ready 2018-09-28 10:39:03 +02:00
Laurent Destailleur
a88dcfd1e4 Fix phpcs 2018-09-28 02:24:11 +02:00
Laurent Destailleur
3f3c8aeb26 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-28 02:23:20 +02:00
Laurent Destailleur
c07ab81e6a Fix trans 2018-09-28 02:22:23 +02:00
Laurent Destailleur
33130853c8 Fix website 2018-09-28 00:59:02 +02:00
Laurent Destailleur
851fd4cc18 NEW Can set the default focus of each page.
NEW Can set if a field is mandatory on form level.
2018-09-28 00:52:15 +02:00
Laurent Destailleur
a623d80830 Work on mandatory form fields 2018-09-27 16:38:18 +02:00
Emma
0979633850 Fix state name for list field title in adherent 2018-09-27 14:22:33 +02:00
Laurent Destailleur
e252a5f046 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-27 12:55:45 +02:00
Laurent Destailleur
62b31df069 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/rssparser.class.php
	htdocs/langs/en_US/boxes.lang
2018-09-27 12:55:25 +02:00
Laurent Destailleur
575c63f87d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/CMailFile.class.php
2018-09-27 12:52:10 +02:00
Laurent Destailleur
6e7fd15e1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-27 12:48:08 +02:00
Laurent Destailleur
291d477f65 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2018-09-27 12:47:48 +02:00
Laurent Destailleur
7b86776f6b Introduce option MAIN_INCLUDE_ZERO_VAT_IN_REPORTS to solve a regression
on feature to report vat by rate when rate is zero
2018-09-27 12:42:52 +02:00
Laurent Destailleur
96c1814793 FIX XSS vulnerability reported by Mary Princy E 2018-09-27 11:33:28 +02:00
Laurent Destailleur
60c74a6255
Merge pull request #9582 from grandoc/new_branch_21_09_2018
Standardize and update code from New branch 21 09 2018
2018-09-27 10:07:15 +02:00
Laurent Destailleur
26d20d0b76
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price
NEW Advanced permission to ignore price min
2018-09-27 09:57:49 +02:00
Laurent Destailleur
4c8664b297
Merge pull request #9619 from ATM-Marc/FIX_6.0_extrafield_columns
FIX: showOptionals: column mismatches
2018-09-27 09:39:51 +02:00
Carsten Brandt
fee46ac845 Update german accounting file to use rowid
- fix "TODO Fix this file to use rowid"
2018-09-27 09:39:00 +02:00
Laurent Destailleur
e35aed0c28 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-27 09:36:31 +02:00
Laurent Destailleur
0004cbde96
Merge pull request #9617 from cebe/fix-german-account-rowids
Update german accounting file to use rowid
2018-09-27 09:36:09 +02:00
Laurent Destailleur
2d88b69cf6
Merge pull request #9616 from frederic34/patch-14
add try catch for swiftmailer
2018-09-27 09:34:21 +02:00
Laurent Destailleur
8e5ff64d22
Merge pull request #9615 from aljawaid/patch-1
NEW Add more common social networks fields for business
2018-09-27 09:33:37 +02:00
Laurent Destailleur
9630c7b5c7
Merge pull request #9614 from grandoc/new_branch_25_09_2018
Add some code comment
2018-09-27 09:31:19 +02:00
Laurent Destailleur
bc5b794b1a
Merge pull request #9613 from frederic34/patch-11
FIX Option MAIN_DISABLE_NOTES_TAB #9611
2018-09-27 09:30:56 +02:00
Philippe Grand
b7304e3d82
Merge branch 'develop' into new_branch_21_09_2018 2018-09-27 09:29:26 +02:00
Laurent Destailleur
ee8b5030a0
Merge pull request #9610 from atm-john/FIX_situation_credit_note
Fix situation credit note
2018-09-27 09:26:23 +02:00
Laurent Destailleur
e3b1cb9fdb
Update facture.class.php 2018-09-27 09:25:37 +02:00