Laurent Destailleur
|
ac897b5b4d
|
Fix css
|
2020-09-29 17:06:08 +02:00 |
|
Laurent Destailleur
|
e86bbe346a
|
Merge pull request #14837 from andreubisquerra/master
NEW: Introducing new modal boxes in TakePOS
|
2020-09-29 16:51:48 +02:00 |
|
Laurent Destailleur
|
fba8fdae6e
|
Merge pull request #14856 from bafbes/abb120146
new:bankline_prepare_head for bank lines
|
2020-09-29 16:40:51 +02:00 |
|
Laurent Destailleur
|
babcc3bc91
|
Update line.php
|
2020-09-29 16:39:47 +02:00 |
|
stickler-ci
|
ce8d240d8f
|
Fixing style errors.
|
2020-09-29 13:06:23 +00:00 |
|
Sekan, Tobias
|
c8e11f9eae
|
Use object fileds on contact list
|
2020-09-29 14:59:16 +02:00 |
|
Laurent Destailleur
|
708ac91a39
|
Merge pull request #14825 from atm-greg/fix_notification_system
Fix notification system
|
2020-09-29 14:13:33 +02:00 |
|
Laurent Destailleur
|
14e6d38fe8
|
Merge pull request #14860 from Tim-Otte/fix-missing-styles-in-lines
FIX: Added support for styling in lines in odt documents
|
2020-09-29 14:11:25 +02:00 |
|
atm-greg
|
a61f79c039
|
only update reminders if event is not past
|
2020-09-29 14:10:24 +02:00 |
|
atm-greg
|
1ed6312f4b
|
add modification of the notifications
|
2020-09-29 14:08:49 +02:00 |
|
Laurent Destailleur
|
e08d7254e2
|
Merge pull request #14849 from aspangaro/13a20
NEW Add column vat rate in page to define accounting account on product/service
|
2020-09-29 14:02:39 +02:00 |
|
Laurent Destailleur
|
4e93fb1e5e
|
Merge pull request #14853 from c3do/patch-16
Fix API $includeparentid when get product
|
2020-09-29 13:34:42 +02:00 |
|
Laurent Destailleur
|
8b2ba8cbba
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/card.php
htdocs/bom/bom_card.php
htdocs/core/class/ldap.class.php
htdocs/core/lib/files.lib.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/admin.lang
|
2020-09-29 13:28:22 +02:00 |
|
Laurent Destailleur
|
29414251f5
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/lib/files.lib.php
|
2020-09-29 13:19:03 +02:00 |
|
Laurent Destailleur
|
1f8f2c0cc3
|
NEW Add 2 rules for emailcollector: Message send/not sent from Dolibarr
|
2020-09-29 13:13:47 +02:00 |
|
Tim Otte
|
82b3b5612d
|
Update extrafields.class.php
That change should not be included in the PR
|
2020-09-29 12:19:19 +02:00 |
|
Tim Otte
|
bdaf41d008
|
Merge branch 'fix-missing-styles-in-lines' of https://github.com/Tim-Otte/dolibarr into fix-missing-styles-in-lines
|
2020-09-29 12:17:45 +02:00 |
|
Tim Otte
|
4611333ee6
|
Added support for styling in lines
|
2020-09-29 12:17:25 +02:00 |
|
Tim Otte
|
3e612d2a94
|
Added support for styling in lines
|
2020-09-29 12:13:41 +02:00 |
|
Sekan, Tobias
|
c0a3aa2b5b
|
add mising elements from last commit
|
2020-09-29 12:00:54 +02:00 |
|
Sekan, Tobias
|
2d4e2ee378
|
Use object field for list fields (project)
|
2020-09-29 10:00:14 +02:00 |
|
Alexandre SPANGARO
|
d8cad89dee
|
Merge remote-tracking branch 'upstream/develop' into 13a20
|
2020-09-29 04:55:33 +02:00 |
|
bahfir abbes
|
9662c4110a
|
new:bankline_prepare_head for bank lines
|
2020-09-29 01:28:39 +01:00 |
|
Laurent Destailleur
|
a6dcf5f1c1
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-09-29 00:51:02 +02:00 |
|
Cédric
|
572b012344
|
Fix API $includeparentid when get product
|
2020-09-28 22:06:15 +02:00 |
|
Laurent Destailleur
|
628978be53
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/adherents/card.php
|
2020-09-28 21:16:25 +02:00 |
|
Nicolas
|
e58d0d4af4
|
FIX Stickler error
|
2020-09-28 20:56:19 +02:00 |
|
Nicolas
|
848ee9decf
|
FIX Stickler error
|
2020-09-28 20:49:51 +02:00 |
|
Laurent Destailleur
|
43c167f0c8
|
Fix init var
|
2020-09-28 20:47:36 +02:00 |
|
Nicolas
|
dfba9a06ad
|
NEW Field to link website page to an other object
|
2020-09-28 20:39:02 +02:00 |
|
Inovea Conseil
|
789defa46f
|
Merge remote-tracking branch 'Dolibarr/develop' into newfieldwebsite
|
2020-09-28 20:08:22 +02:00 |
|
Inovea Conseil
|
c813193017
|
Merge remote-tracking branch 'Dolibarr/develop' into develop
|
2020-09-28 20:07:06 +02:00 |
|
Laurent Destailleur
|
236c9bf1d2
|
Fix regression making export feature not working
|
2020-09-28 20:05:58 +02:00 |
|
Laurent Destailleur
|
bd11154bfc
|
NEW Can filter on accounting system ref in export of chart of account
|
2020-09-28 18:56:53 +02:00 |
|
Laurent Destailleur
|
4cf6e483ca
|
Fix export of various payments.
|
2020-09-28 18:49:20 +02:00 |
|
Florian
|
bdb38da9d3
|
Add 2 new field typeObject and ObjectId to website
|
2020-09-28 18:17:23 +02:00 |
|
Laurent Destailleur
|
0093671a04
|
Merge pull request #14846 from aspangaro/13a19
NEW Add export for various payment
|
2020-09-28 17:40:18 +02:00 |
|
Laurent Destailleur
|
0c64b01ae9
|
Merge pull request #14847 from OPEN-DSI/new-emailcollector-mail-header-remove
NEW MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const in email collector
|
2020-09-28 17:25:49 +02:00 |
|
Laurent Destailleur
|
53b9866d20
|
Merge pull request #14845 from TobiasSekan/FixWrongExpectedTypeInViewcat
FIX wrong expected type for "dol_print_error" in "viewcat.php"
|
2020-09-28 17:23:28 +02:00 |
|
Sekan, Tobias
|
6c1700d84a
|
Fix contratcs are always zero on statistics board
|
2020-09-28 17:22:11 +02:00 |
|
Laurent Destailleur
|
6b4a05cf06
|
Merge pull request #14843 from TobiasSekan/FixContractAlwaysZeroOnStatisticsBoard
FIX Contratcs count are always zero on statistics board
|
2020-09-28 17:21:19 +02:00 |
|
Laurent Destailleur
|
8ae3cabbac
|
Merge pull request #14842 from aspangaro/13a18
Fix - Accountancy - select date on periodicity by default & some fix
|
2020-09-28 17:20:56 +02:00 |
|
Laurent Destailleur
|
2cbec87ddc
|
Update accountancy.lang
|
2020-09-28 17:20:41 +02:00 |
|
Laurent Destailleur
|
c6c2dc53cb
|
Merge pull request #14844 from TobiasSekan/FixCountErrorOnUserCatgories
FIX count error on user categories
|
2020-09-28 17:17:49 +02:00 |
|
Florian
|
de5e6cf546
|
Add 2 new field typeObject and ObjectId to website
|
2020-09-28 17:04:45 +02:00 |
|
lvessiller
|
1b5a0ce3bf
|
FIX uses price2numjs
|
2020-09-28 17:04:20 +02:00 |
|
Cédric
|
3bc9c49307
|
Update api_orders.class.php
|
2020-09-28 16:57:30 +02:00 |
|
atm-greg
|
988a532bed
|
fix br
|
2020-09-28 16:37:17 +02:00 |
|
Laurent Destailleur
|
1a28d7f641
|
Fix missing token
|
2020-09-28 16:33:27 +02:00 |
|
Laurent Destailleur
|
b61815e95f
|
Typo in action test
|
2020-09-28 16:22:15 +02:00 |
|